Cleanups - and this also fixes the previously crashing DELETE tests.