Changed more Thread.sleep() calls to while loops to improve reliabiity of VacuumdTest.