update to use block-device-mapping for testing