Merge "Improve ApiFormatJson test coverage"