Merge branch 'fix-warnings-in-tests' into 'develop'