Uncomment UT
Remove file
Merge pull request #551 from andrerod/dev

Uncomment UT