Fix some arv unit tests.