Merge "add some negative tests for force_delete/restore"