Couple more visibility tests, they aren't completely finished though