UnitTest: added framework and basic unit test
Clean up