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