Merging test framework additions/modifications