reorg unittests
Remove extra unused utils file
Working on a bunch of unittests.
Merge branch 'tests'  Unit tests in progress