Minor changes to comments and the test cases.