Sketch in test suite files (from bzr-email)