Improve load test structure