*Moved the misc code to the UnitTest from the CLI