[CB-4472] Fix tests broken by previous commit.