Renamed tests
Shutdown improvements for test compatibility