Fix tests to ensure merge functions do not need to be modified#4718

jtraglia merged 2 commits intoethereum:masterethereum/consensus-specs:masterfrom

AbolareRoheemah:fix_merge_func_modify_in_gloas_testAbolareRoheemah/consensus-specs:fix_merge_func_modify_in_gloas_testCopy head branch name to clipboard