Make sure the base device is well created before running the tests
Merge branch 'dm-fix-test-2' into dm

Conflicts:
	runtime_test.go