Fixes/improvements to the performance tests.