Fixed bugs with the new dispatcher setup fixed dispatch.t

Boy, that test was messed up. Oops.