tests passed
Merge branch 'hotfix/fix_tests'

* hotfix/fix_tests:
  tests passed