New test cases are added, and some small changes