Adjustment to tests and code of the AviSource family.