Merge "Add tests for ApiFormatBase"