Making tests for navigation pass again - but with similar code