op-challenger: Avoid deadlocks in unit test. Use a simple for loop instead of wait since it wasn't really waiting.