Noted.  I've added a bunch of extra tests, and fixed up some behavior accordingly.