cleaned some tests
Merge branch 'hotfix/fix-tests'
Merge branch 'master' into develop