Added more unit tests.  Fixed various syntax issues.  All unit tests are successful.