Fixing warnings.  Added a couple more unit tests.