Mapping test, smal fixes in AO definitions