Don't import fsnav during setup
Unittests and bug fixes