Merge "Improve cinder CLI existing tests"