Refactor of the unit tests
Merge branch 'enhancement-#w5' into develop