Added basic dispatcher testing. Still have a problem with dispatch-test