Attempt at fixing the TestInvoke helpers