added unit tests and corrected timing navigation