Fix tests.
Merge pull request #4462 from openscholar/4458

Fix tests.