Fix delete test not running and CS fix