Build Terr.Loop from For instead of While, expose test/update