Fix VA tests.