Fix UT
Merge pull request #101 from andrerod/dev

Fix UT