adapt tests to new AA