Fix all but one test in test_dispatcher