one more big reorg of unit tests. 54% code coverage