tests/acceptance: wait() instead of shutdown() where appropriate