Okay, I think we should have four different tests then: a test that tests when no block device mappings are present, one that tests EC2 style block device mappings, one that tests GCE style block device mappings, and one that tests when the block device mapping doesn't quite match the devices on the machine.