Minor generalisation to allow testing ventoy use cases.