add partitions, set type
use gpt and msdos templates
use separate tests for gpt and msdos
properly deal with type for non-msdos label