TISTUD-4739 Fix failed unit tests on studio3 repo
  - another try at a fix related to charsets