Minor revisions, more test cases