More ut updates
Merge pull request #21 from jaytaph/unittest4

More ut updates