Update: tutorial v, test suit