VE-1044: Fix another set of tests.