Fix the rest of the feedback tests