Feature 1 - static navigation, added tests