First revision with test script.