Removed wait_until

It was a little big kludge-y, and in all the cases I could find, could be replaced
with something more appropriate. Particularly joining threads.
Refactoring tests
Coverage, code review changes