Slightly expand tests, inspired by bug #50060, but ultimately show there is a deeper issue outstanding