Improving UT cmd processing APIs
Merge pull request #64 from andrerod/clean_ut

Improve UT logic