added tests (and fixes) for Extractor class