Merge "Merge the two separate preference test targets"