Merge "Add more ApiFormat format tests"