Added remaining, desired unit tests.  Performed final clean-up.