Fix the unit tests
Merge pull request #1359 from julceslauhub/master

Unit tests fixed