Fix unit tests on release-2.5.x

Review Request #8326 — Created Aug. 12, 2016 and submitted — Latest diff uploaded

Information

Review Board
release-2.5.x
17efbb4...

Reviewers

A few recent changes broke a bunch of unit tests. This change fixes them up.

Ran unit tests.