Fix unit test and add in require-dev matthiasnoback dependency
Merge pull request #441 from Prims47/2.4-develop

Fix unit test and add in require-dev matthiasnoback dependency