clean duplication in shared tests for waiters