Enable UT
Merge pull request #342 from andrerod/dev

Enable UT