Improve the dispatch tests a bit.