Testcases for r224939.