added unit test. changed navigation