Issue #168 - Added unit tests, all pass now