Fix failing dispatcher tests.