Load test improvements