UT suite fix.
Merge pull request #357 from nem0/Unit_Tests

UT suite fix.