Some improvements to load test tool