fix most of the dispatcher tests