Improve tests for ChangeOpReferenceRemove

Change-Id: Id2485bf07d6d7b320a1906a626e9489cd3780b42
Merge "Improve tests for ChangeOpReferenceRemove"