Fixed old broken tests
Merge pull request #22 from alanquillin/FixOldFailingUnitTests

Fixed old broken tests