Fixed a bunch of test_dispatcher tests