Re-adding Michael/Emily's fix for isVisible - <Mojo>
Adding some more tests - <Mojo>