Improved merge testing