Big updates for the tutorial test.