Merge branch 'unittest' into 'unittest'

Unittest standardization

See merge request !4
7 jobs for unittest in 57 seconds (queued for 2 seconds)