Fix diff migration unit tests from bad merge
Review Request #8342 — Created Aug. 22, 2016 and submitted — Latest diff uploaded
My merge from 2.0.x to 2.5.x missed a few instances of the diff being
replaced by a class constant, as well as the merging of the twosetUp
methods. This patch addresses that.
Ran unit tests.