Item12952: unit test fixes and knock-on changes for probems so revealed. SaveTests still fail, though this is non-critical as the code is not currently used