Add the wait_for_* tests
Inhibit the wait_for_* tests for the moment