Merging test framework fixes