Topic/improve visibility tests