fixed deadlock + added load test