Add some regression tests for plausible failures in this area.
Attach a file by drag & drop or click to upload
