Updated all blockstorage tests to reflect cloudcafe v1/v2 refactor.

* Deduplicated all tests.  Tests can now be written once for both
  versions of the api.

Change-Id: I083dda946d8b5757659bd118964a56e58eb2924f
Merge "Updated all blockstorage tests to reflect cloudcafe v1/v2 refactor."