Merging changes for test framework

Merging changes for test framework