[1.7.x] Updated tests per previous commit.

Backport of 86c74eacd6 from master