Use OnDemandExtractor for extractor tests
This avoids open coding the property deserialization, and extends test coverage to include the OnDemandExtractor class.
This avoids open coding the property deserialization, and extends test coverage to include the OnDemandExtractor class.