Fixing PAV tests.