There is some logic around how EBS mappings are handled / generated depending on whether an image if from scratch or not. There was no testing around this behaviour before. This strips that logic out into a separate function, to enable testing it independentlhy.