add shape for aa
Fix test