Changing to current version of tools
Merge branch 'master' of https://github.com/jrawbits/testtools