Merge "Improved Cinder snapshot tests"