Merge "Refine surrounding text logic and test case readability."