simplify the tests folder