Make sure factory stops when it gets to the end of a feed
Fix URL in tests