Fix failing tests related to where values change to strings

Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d.