Fix tests
Merge branch 'fix-tests' into develop
Merge branch 'develop'