Remove feeder and add tests for the new fetcher