Re #8326. Add some testing.