Add improvements to unit tests
Merge pull request #856 from romainneutron/tests-phaze2

[3.9] Add improvements to unit tests