More examples for Nav testing and started fixing the multi-course nav.