Issue #97 - testContext now would return a corrected number if applicable.