Fix Test Crashes