Modifications to load test