Adapted helpers' unit tests for extractors. Removed unneeded helpers.