Master perftest fixes

Improves performance tests for 'master'.

Now 'master' and 'develop' have the same perf tests.