Fix tests/arv building.