Modify test cases and some changes