Merge branch 'fix-tests' into 'develop'