Fix up a couple test in test_dispatcher