Fix tests broken by the change in commit 911a638fde754f0e526d5631ff076a38906050b3

Also now the error raised when there is a problem just fetching a feed is different than the one raised specifically when there is a problem with feed autodiscovery (which only happens when a user tries to add a subscription to a feed not existing in the database).