Merge "add keystone group tests"