Merge pull request #20542 from seamuslee001/hook_test_fixes_2