TESTS: directory structure changes