Improve load test