Attempt to fix performance tests