Increased test coverage on shutdown calls