Merge branch 'master' into Tom's-branch

got the test runner updated into my branch