restruct & fixes for tests, add tests for basis.path