Add testcases for PRs 47449/47446.