Fix unit tests

Ahmad Samirrequested to merge
work/ahmad/unit-tests into master

The error message on my system is different, doesn't hurt to check both.

GIT_SILENT

Merge request reports