Cleaned up how I load tests