Working fix for performance tests