Moved more functions into tests. Thru "Control Flow" in TSPL.