Added-Unit-Tests
Merge branch 'unit-tests'