Add extra test cases for merge changeops

Change-Id: I5a60e95d27f7d2729a28ae9b5dd49c64f3c0ec14
Merge "Add extra test cases for merge changeops"