Add waiters back to test code.
Updating merge and tests