Add missing files from #7702's test