Fixed test to follow new merge rules