Generalise class testing predicate builder to handle Roles