better shutdown + test that shutdown