Fix various integration tests

Should we use an async assert to let us switch to a feed-based mechanism for detecting when the process has stopped?