Added Extractor tests and adjusted functionality