Index: ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_list_spec.rb
===================================================================
--- ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_list_spec.rb	(revision 219)
+++ ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_list_spec.rb	(revision 220)
@@ -7,8 +7,8 @@
   before(:each) do
     items = %w{one two three}.collect do |n|
-      Element.new(:name => DvText.new(n),
+      Element.new(:name => DvText.new(:value => n),
                   :archetype_node_id => 'test')
     end
-    item_list_name = DvText.new('item list')
+    item_list_name = DvText.new(:value => 'item list')
     @item_list = ItemList.new(:name => item_list_name,
                               :archetype_node_id => 'test',
@@ -32,5 +32,6 @@
 
   it 'retrieve the names of all items' do
-    @item_list.names.should == %w{one two three}.collect{|n| DvText.new(n)}
+    @item_list.names.should == %w{one two three}.collect{|n|
+      DvText.new(:value => n)}
   end
 
Index: ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_table_spec.rb
===================================================================
--- ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_table_spec.rb	(revision 219)
+++ ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_table_spec.rb	(revision 220)
@@ -7,5 +7,5 @@
 def row(args)
   return args.collect do |n|
-    Element.new(:name => DvText.new(n),
+    Element.new(:name => DvText.new(:value => n),
                 :archetype_node_id => 'test')
   end
@@ -13,5 +13,5 @@
 
 def cluster_builder(name,rows)
-  return Cluster.new(:name => DvText.new(name),
+  return Cluster.new(:name => DvText.new(:value => name),
                      :archetype_node_id => 'test',
                      :items => rows)
@@ -23,5 +23,5 @@
     row2 = row(%w{four five six})
     rows = [row1, row2].collect{|r| cluster_builder('cluster',r)}
-    @item_table = ItemTable.new(:name => DvText.new('item table'),
+    @item_table = ItemTable.new(:name => DvText.new(:value => 'item table'),
                                 :archetype_node_id => 'test',
                                 :rows => rows)
@@ -47,5 +47,6 @@
 
   it 's row_names should be cluster cluster' do
-    @item_table.row_names.should == %w{cluster cluster}.collect{|n| DvText.new(n)}
+    @item_table.row_names.should == %w{cluster cluster}.collect{|n|
+      DvText.new(:value => n)}
   end
 
@@ -56,5 +57,6 @@
 
   it 's column_names should one two three' do
-    @item_table.column_names.should == %w{one two three}.collect{|s| DvText.new(s)}
+    @item_table.column_names.should == %w{one two three}.collect{|s|
+      DvText.new(:value => s)}
   end
 
Index: ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_tree_spec.rb
===================================================================
--- ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_tree_spec.rb	(revision 219)
+++ ruby/branches/0.5/spec/lib/open_ehr/rm/data_structures/item_structure/item_tree_spec.rb	(revision 220)
@@ -8,8 +8,8 @@
   before(:each) do
     items = %w{one two}.collect do |name|
-      Element.new(:name => DvText.new(name),
+      Element.new(:name => DvText.new(:value => name),
                   :archetype_node_id => 'test')
     end
-    name = DvText.new('item tree')
+    name = DvText.new(:value => 'item tree')
     @item_tree = ItemTree.new(:name => name,
                               :archetype_node_id => 'test',
Index: ruby/branches/0.5/spec/lib/open_ehr/rm/data_types/basic/dv_state_spec.rb
===================================================================
--- ruby/branches/0.5/spec/lib/open_ehr/rm/data_types/basic/dv_state_spec.rb	(revision 219)
+++ ruby/branches/0.5/spec/lib/open_ehr/rm/data_types/basic/dv_state_spec.rb	(revision 220)
@@ -3,9 +3,11 @@
 include OpenEHR::RM::Support::Identification
 include OpenEHR::RM::DataTypes::Text
+
 describe DvState do
   before(:each) do
     @terminology_id = TerminologyId.new('openher')
     code_phrase = CodePhrase.new('524', @terminology_id)
-    dv_coded_text = DvCodedText.new("initial", code_phrase)
+    dv_coded_text = DvCodedText.new(:value => "initial",
+                                    :defining_code => code_phrase)
     @dv_state = DvState.new(:value => dv_coded_text,
                             :is_terminal => false)
@@ -22,5 +24,6 @@
   it 'should change other value assigned' do
     code_phrase = CodePhrase.new('526',@terminology_id)
-    dv_coded_text = DvCodedText.new('planned', code_phrase)
+    dv_coded_text = DvCodedText.new(:value =>'planned',
+                                    :defining_code => code_phrase)
     lambda {
       @dv_state.value = dv_coded_text
