Performance tester refactoring...