Improve test coverage
Merge branch 'develop'