test encoding fixed
Merge branch 'hotfix/tests_encoding'

* hotfix/tests_encoding:
  test encoding fixed