Fix various integration tests

+1 to using a proper polling mechanism! Arguably the presence of the active process doesn't guarantee the service is accepting connections from clients (my definition of "service up"), but it's probably good enough for the toy cases.