cleaned up tests and refactored in the new navigate class