Merge branch 'issue/88' into 'develop'

Issue #88: Refactor struct of tests

See merge request !75
3 jobs for develop in 50 seconds (queued for 3 seconds)