Added test to Extractor class, added some defaults