Refactored and moved to the load tests