some modify on scripts and test cases