Generate better deletes in tests