Merge branch 'tests/improve-test-coverage' into 'develop'