Change the expectations to test for
visibility instead of the internal props
this also removes some non needed code