Add more dispatch tests