simplify the test directory structure