Added some structure to the load tests