+ env
Refactoring tests...
New tests and bug fixes
+ from fsnav import tests