Improve performance_test a bit.