Some banchmark fixes in agi_test.go