Refactor performance tests