Refactor Feed Tests