Fix a failing unit test.
Merge branch 'fix_failing_test' into 2.5-testing
Merge branch '2.5-testing' into 2.5-dev