Other AA fixes
Merge pull request #1625 from IgorStepanov/formataafix2

AA test fixes (part 2)