Made some fixes to unit_tests.  Getting ready to create validation tests.