ensure the test waiter’s life-cycle is entangled with its containers

if we add a waiter in an initializer currently we must also remove them or we will result in duplicates or waiters leaking from previous tests.

- [ ] make changes as @ef4 sees fit :)