Repair block device mapping format and tests

Correct block device mapping format is {dev_name: vol_id, ...}.