Adding some more visibility test stuff and maybe a FIX