Merge branch 'issue/92' into 'develop'

Issue #92: Improve test coverage

See merge request !81
3 jobs for develop in 57 seconds (queued for 1 second)