Fixed up tests and cleaned rss