Merge branch 'hotfix/platidoma_remove'

* hotfix/platidoma_remove:
  platidoma removed
tests passed
Merge branch 'hotfix/fix_tests' into develop

* hotfix/fix_tests:
  tests passed