Refactoring performance testing suite