fixing unit tests
Merge branch 'hotfix/unittestfixes'