Merge branch 'hotfix/tests' into develop
codeclimate coverage
Merge branch 'develop'