Oh, and no objection to adding more test cases.  Will work on that a bit later.