Fix 16 more dispatcher tests (out of 73)