Fix volume XML tests

Run the xml version in the .*XML classes instead of the json version.

Change-Id: Ib7d92119ecf1b1c5ecca8b14747b628c7e70eb7d
Merge "Fix volume XML tests"