Merge "Begins refactoring delete into test and execute steps"