Merge "Add tests for CINDER services v1 APIs"