Merge "Fix a test case of 35chars+"