Fixed extractors, added ValueCount, more tests