Performance test refactoring