preparing navigator test
refactoring tons of stuff while working on NavigatorTest