volumetypes unit tests; 'Extract' method for consistency; rename blockStorage to blockstorage and volumeTypes to volumetypes