Increase test coverage and bring back rss feed through preliminary hack
Fix merge conflicts