Updated merge tests