Cleanup and initial UnitTests