This change also adds some tested getters to the DiffOp class to improve testability of the class Change-Id: I26eafd791b9892f565a18d0502474ef9c24f9a29