CSP Test Cleanup