Update AssertValue() implementation
Code cleanup
Merge pull request #2167 from ke-yu/fix_testframework

Update AssertValue() implementation