Add Extractor tests