adapted to ValueSet resource; enhanced test suite