Fixed the unit tests for issue #378
Merge pull request #1 from ezimuel/fix/unit-test-#378

Fix/unit test #378