Add test cases for extractor. Update Extractor class to fix issues.
Add tests for and methods to Extractor to allow them to define a product to extract.