Adding some visibility test stuff