A possible fix for the intermittent CI test failures

Because of the execution order of these tests these wrapped methods may not execute in time. Hoping the new stub system will fix the intermittent CI failures.