diff --git a/plugins/mezuro/test/fixtures/module_node_fixtures.rb b/plugins/mezuro/test/fixtures/module_node_fixtures.rb
new file mode 100644
index 0000000..3432057
--- /dev/null
+++ b/plugins/mezuro/test/fixtures/module_node_fixtures.rb
@@ -0,0 +1,30 @@
+class ModuleNodeFixtures
+
+  def self.qt_calculator_tree
+    node = Kalibro::Entities::ModuleNode.new
+    node.module = ModuleFixtures.qt_calculator
+    node.children = [new_node('Dialog', 'CLASS'), new_node('main', 'CLASS')]
+    node
+  end
+
+  def self.qt_calculator_tree_hash
+    {:module => ModuleFixtures.qt_calculator_hash,
+      :child => [
+        {:module => {:name => 'Dialog', :granularity => 'CLASS'}},
+        {:module => {:name => 'main', :granularity => 'CLASS'}}
+      ]
+    }
+  end
+
+  private
+
+  def self.new_node(name, granularity)
+    the_module = Kalibro::Entities::Module.new
+    the_module.name = name
+    the_module.granularity = granularity
+    node = Kalibro::Entities::ModuleNode.new
+    node.module = the_module
+    node
+  end
+    
+end
diff --git a/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb b/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb
index da00940..385921c 100644
--- a/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/entities/metric_configuration_test.rb
@@ -18,8 +18,10 @@ class MetricConfigurationTest < ActiveSupport::TestCase
   end
 
   should 'create appropriate metric type' do
-    assert self.class.amloc_configuration.metric.instance_of?(Kalibro::Entities::NativeMetric)
-    assert self.class.sc_configuration.metric.instance_of?(Kalibro::Entities::CompoundMetric)
+    amloc = MetricConfigurationFixtures.amloc_configuration
+    sc = MetricConfigurationFixtures.sc_configuration
+    assert amloc.metric.instance_of?(Kalibro::Entities::NativeMetric)
+    assert sc.metric.instance_of?(Kalibro::Entities::CompoundMetric)
   end
 
 end
diff --git a/plugins/mezuro/test/unit/kalibro/entities/metric_result_test.rb b/plugins/mezuro/test/unit/kalibro/entities/metric_result_test.rb
index 6db1169..59c8506 100644
--- a/plugins/mezuro/test/unit/kalibro/entities/metric_result_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/entities/metric_result_test.rb
@@ -18,8 +18,8 @@ class MetricResultTest < ActiveSupport::TestCase
   end
 
   should 'create appropriate metric type' do
-    assert self.class.amloc_result.metric.instance_of?(Kalibro::Entities::NativeMetric)
-    assert self.class.sc_result.metric.instance_of?(Kalibro::Entities::CompoundMetric)
+    assert MetricResultFixtures.amloc_result.metric.instance_of?(Kalibro::Entities::NativeMetric)
+    assert MetricResultFixtures.sc_result.metric.instance_of?(Kalibro::Entities::CompoundMetric)
   end
 
   should 'convert single descendent result to array' do
diff --git a/plugins/mezuro/test/unit/kalibro/entities/module_node_test.rb b/plugins/mezuro/test/unit/kalibro/entities/module_node_test.rb
index 5ffd61d..f4d8a36 100644
--- a/plugins/mezuro/test/unit/kalibro/entities/module_node_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/entities/module_node_test.rb
@@ -1,35 +1,12 @@
 require "test_helper"
 
-class ModuleNodeTest < ActiveSupport::TestCase
-
-  def self.qt_calculator_tree
-    node = Kalibro::Entities::ModuleNode.new
-    node.module = ModuleTest.qt_calculator
-    node.children = [new_node('Dialog', 'CLASS'), new_node('main', 'CLASS')]
-    node
-  end
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/module_node_fixtures"
 
-  def self.new_node(name, granularity)
-    the_module = Kalibro::Entities::Module.new
-    the_module.name = name
-    the_module.granularity = granularity
-    node = Kalibro::Entities::ModuleNode.new
-    node.module = the_module
-    node
-  end
-
-  def self.qt_calculator_tree_hash
-    {:module => ModuleTest.qt_calculator_hash,
-      :child => [
-        {:module => {:name => 'Dialog', :granularity => 'CLASS'}},
-        {:module => {:name => 'main', :granularity => 'CLASS'}}
-      ]
-    }
-  end
+class ModuleNodeTest < ActiveSupport::TestCase
 
   def setup
-    @hash = self.class.qt_calculator_tree_hash
-    @node = self.class.qt_calculator_tree
+    @hash = ModuleNodeFixtures.qt_calculator_tree_hash
+    @node = ModuleNodeFixtures.qt_calculator_tree
   end
 
   should 'create module node from hash' do
--
libgit2 0.21.2