Update UT, remove dead code
Merge remote branch 'upstream/master'
Merge pull request #274 from haripk/master

Update UT, remove dead code