AA tests harmonization with new AA implementation