Add follow up tests for hook handler lazy loading race conditions

Add follow up tests for hook handler lazy loading race conditions #2238