Increased test coverage, added more tests.  Still a work in progress.