Added some more test items, and refactored the tests a bit.  More test coverage.