Test fix for agent changes, and fix for agent migrations.