This unit test was not consistent...this change fixes that, as well as adds a test structure for doing these common waits for condition that we have to do
Slight optimization (but those ms's count even in unit tests)
Made this test faster by using the new condition instead of doing 10ms sleeps
A couple more unit tests, also switched over to use the new TestCondition