BUG-7003: Remove Thread.sleep() calls in tests