Removed popup hidden functionality
Added some more tests