Changed short Thread.sleep() times into while() loops to fix flapping
EventdTest.