Re #7673. Fixing performance tests.