Merged the Feeds and Subscriptions controller
Renamed the acceptance test of the FeedsController