Preparation for performance tests
Improved fairness by a lot!