fix dispatch order test
add more tests