Fixed breaking tests
Merge branch 'hotfix/fix-tests'