Improving navigation and some small tests