Some changes to the merger test...