modifications to tests for imports to reflect dir structure