Tests updates due to volume type dataset changes

 * Can now run snapshot tests with dataset tags

Change-Id: Ia88f48b3b4b99d4bf257dbb82bb0003b87e9c9c5
Merge "Tests updates due to volume type dataset changes"