Add @kmsquire's test for #4453