finishing up unit tests.  cleaning up some residual interim changes