Corrected Shutdown from Tests