Add test for test helper and fixup dispatch test