Add Merge, more tests