Merge "Add basic Keystone CLI tests"