Merge branch 'develop-unittest_fixes' into 'master'

Develop unittest fixes

See merge request !74
1 job for master
in 10 minutes and 6 seconds, using 0 compute credits, and was queued for 6 seconds