redo test script, modify tests