Performance Test Refactor