Tests: Fix failures with fielddata tests introduced via the previous commit.