This change expects all the tests to be under the Tests folder under the
Perf folder

and some refactorings