flattened the test directory a bit more