No reviewer required - Correctly populate avp map

Fixes Homestead UTs.