Some minor updates and more test cases.