(#3040) - tweaks to perf tests