Modified testing to comply with changes in extractor.