outsourced some test helper, added nav-generator
added navigation and controller-logic = specs