Merge "Change perf tests to have less deviation."