diff --git a/plugins/mezuro/lib/kalibro/entities/entity.rb b/plugins/mezuro/lib/kalibro/entities/entity.rb
index fd17565..0becd38 100644
--- a/plugins/mezuro/lib/kalibro/entities/entity.rb
+++ b/plugins/mezuro/lib/kalibro/entities/entity.rb
@@ -53,8 +53,10 @@ class Kalibro::Entities::Entity
   end
   
   def convert_to_hash(value)
-    return value.collect { |element| convert_to_hash(element) } if value.kind_of?(Array)
-    return value.to_hash if value.kind_of?(Kalibro::Entities::Entity)
+    return value.collect { |element| convert_to_hash(element) } if value.is_a?(Array)
+    return value.to_hash if value.is_a?(Kalibro::Entities::Entity)
+    return 'INF' if value.is_a?(Float) and value.infinite? == 1
+    return '-INF' if value.is_a?(Float) and value.infinite? == -1
     value
   end
 
diff --git a/plugins/mezuro/test/functional/base_tool_client_test.rb b/plugins/mezuro/test/functional/base_tool_client_test.rb
new file mode 100644
index 0000000..5f42d8a
--- /dev/null
+++ b/plugins/mezuro/test/functional/base_tool_client_test.rb
@@ -0,0 +1,22 @@
+require "test_helper"
+
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/native_metric_fixtures"
+
+class BaseToolClientTest < ActiveSupport::TestCase
+
+  def setup
+    @client = Kalibro::Client::BaseToolClient.new
+  end
+
+  should 'get base tool names' do
+    assert_equal ['Analizo', 'Checkstyle'], @client.base_tool_names
+  end
+
+  should 'get base tool by name' do
+    analizo = @client.base_tool('Analizo')
+    amloc = NativeMetricFixtures.amloc
+    amloc.languages = ["C", "CPP", "JAVA"]
+    assert_includes analizo.supported_metrics, amloc
+  end
+
+end
\ No newline at end of file
diff --git a/plugins/mezuro/test/functional/metric_configuration_client_test.rb b/plugins/mezuro/test/functional/metric_configuration_client_test.rb
new file mode 100644
index 0000000..e2f008a
--- /dev/null
+++ b/plugins/mezuro/test/functional/metric_configuration_client_test.rb
@@ -0,0 +1,25 @@
+require "test_helper"
+
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
+
+class MetricConfigurationClientTest < ActiveSupport::TestCase
+
+  def setup
+    @client = Kalibro::Client::MetricConfigurationClient.new
+  end
+
+  should 'save metric configuration' do
+    configuration = MetricConfigurationFixtures.amloc_configuration
+    @client.save(configuration, 'Configuration X')
+  end
+
+  should 'get metric configuration by name' do
+    configuration = MetricConfigurationFixtures.amloc_configuration
+    assert_equal configuration, @client.metric_configuration('Configuration X', 'Metric X')
+  end
+
+  should 'remove metric configuration by name' do
+    @client.remove('Configuration X', 'Metric X')
+  end
+
+end
\ No newline at end of file
--
libgit2 0.21.2