Merge pull request #193 from qiangdavidliu/2.x

Test framework updates