Move tests for code in directory diffop/diff into matching test directory

Change-Id: I13547b4820660431807e1b120ff3d92614196996