Minor refactoring based on code review.  Enhanced unit test.
Removed unit test.  Their mocked objects did not handl 'null' well and caused errors.