Improved test coverage for tab and navigator