Merge to work on top of changes for test framework