Add new unit tests.
Fix merge issues
Merge branch 'master' of https://github.com/Mishel-1973/TestGit