No, but in #982 srv.stop(test.done.bind(test)) does -- will roll that into this