Fix rest of test_dispatcher.py