Fix perf tests after recent changes.