Stop using object under test to create records
Backfill test around object deletion