Modified some test cases

not perfectly working yet