Merge "add tests for force delete snapshot:"