Bump timeout to 30 minutes
Remove extra assertion
Assert here
and here
Remove a version that's no longer necessary
Simplify
No need to wait for shutdown in most tests