Added correct unit type generation for sample characteristics/factor values