Added a few changes to load tests