Tests now give time in ms per test as part of output.
Merge branch 'master' into watchpoints