Refactor Delete Test