Updated tests to reflect code changes.  Added some new tests also.