minor changes, test script