More tests and tweaks to soft delete.