More fixes for the DAV test.