Fix unit tests, which hadn't kept up to date with SketchInfo changes.