Some simple refactoring on the load testing