fixed tests and removed navigation code lines