Fixed last test cases