Make attachment/blob location handling behave more like mgd and increase test coverage