Merge more test framework changes