Merge testing changes