Merge "Add test_get_res_from_aai"