Ported volumes and snapshots smoke to v2 from v1

* Fixed issues with v1 tests importing datasets and composites
  from old locations.

Change-Id: I1122a0da82ab607c2e2572e70a4f22873fa94d2b