Merge "Keystone to Keystone tests"