Add Vessel.Type and vessel test