Tidy up TF output.
Fix incorrectly named function in SCRATCH.
Extend SCRATCH test suite.