Longer performance tests for more significant results
Bugfix in performance tests
merge