Merge "Improve testing for ApiFormatBase subclasses"