Performance test improvements.