Adding a test and updating navigation to work with non-default Zones