Improvements to performance testing code