Feed fixes and tests