Added buffer and refactored the load test tool