Updated TODO
Added feed tests