Scale, TestScale, and some TutHelpers updates