Cleaning up code.  Adjusting unit test.