Moved test cases from #8195 to a better place.