Catch up AFP changes in the API tests