Fix my test and clean up the dispatcher a bit