I think this will fix the unit tests.
More unit test fail fixage
Merge pull request #271 from rdodev/unit-test-fix

I think this will fix the unit tests.