typi in test fixed.
reanamed parameters in the streem definitions.
collapsed USE_MEASURED_TEMP_AND_CONDUCTIVITY_FOR_DENSITY_CALC and USE_MEASURED_TEMP_FOR_DENSITY_CALC into same variable.