Shutdown tests passing