Cleanups this includes setup to allow unit tests (not in this PR) to run