Repair all tests back again (The dispatcher was not disabled in the tests, I wonder why it was working some check-ins before)