Refactor Desktop tests (Feed has landed on dev and stage)