ashwin/pooja | #2235 | fixing feed tests