Merge "Convert volume api tests to use global CONF object"