Separted unit test into 2 tests.  Cleanup the fall out