Cleanup
Added tests for feed querying