Working on getting dispatcher tests green, still fighting with bytes/unicode