Typos and a couple of extra tests.
Merge branch 'master' of https://github.com/johnno1962/Xtrace