Refactored AddDefaultColumnValues into SetDefaultColumnValues

Refactored AddDefaultColumnValues (which overrides the default values) to SetDefaultColumnValues which replaces and/or adds to the default columnvalues but retains non changed ones

Added corresponding tests