Safer shutdown for test_universal