Fix the rest of the dispatcher tests