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

...e.

I also changed formatting, which didn't make things easier.