Working on test unit and merge of ini and dbo.pref