Fixed tests, brought back the dispatch-helper test.