diff --git a/plugins/mezuro/lib/kalibro/client/kalibro_client.rb b/plugins/mezuro/lib/kalibro/client/kalibro_client.rb
index c38a3aa..3faf08f 100644
--- a/plugins/mezuro/lib/kalibro/client/kalibro_client.rb
+++ b/plugins/mezuro/lib/kalibro/client/kalibro_client.rb
@@ -12,4 +12,8 @@ class Kalibro::Client::KalibroClient
     @port.request(:process_project, {:project_name => project_name})
   end
 
-end
\ No newline at end of file
+  def self.process_project(project_name)
+    new.process_project(project_name)
+  end
+
+end
diff --git a/plugins/mezuro/lib/kalibro/client/project_client.rb b/plugins/mezuro/lib/kalibro/client/project_client.rb
index 2945ec7..4a9b9cf 100644
--- a/plugins/mezuro/lib/kalibro/client/project_client.rb
+++ b/plugins/mezuro/lib/kalibro/client/project_client.rb
@@ -8,6 +8,10 @@ class Kalibro::Client::ProjectClient
     @port.request(:save_project, {:project => project.to_hash})
   end
 
+  def self.save(project)
+    new.save(project)
+  end
+
   def project_names
     @port.request(:get_project_names)[:project_name].to_a
   end
@@ -21,4 +25,4 @@ class Kalibro::Client::ProjectClient
     @port.request(:remove_project, {:project_name => project_name})
   end
 
-end
\ No newline at end of file
+end
diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb
index 091aed1..f328c17 100644
--- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb
@@ -22,8 +22,8 @@ class MezuroPlugin::ProjectContent < Article
   private
 
   def send_project_to_service
-    Kalibro::Client::ProjectClient.new.save(project)
-    Kalibro::Client::KalibroClient.new.process_project(title)
+    Kalibro::Client::ProjectClient.save(project)
+    Kalibro::Client::KalibroClient.process_project(title)
   end
 
   def project
diff --git a/plugins/mezuro/test/unit/kalibro/client/kalibro_client_test.rb b/plugins/mezuro/test/unit/kalibro/client/kalibro_client_test.rb
index 101907d..0f67a67 100644
--- a/plugins/mezuro/test/unit/kalibro/client/kalibro_client_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/client/kalibro_client_test.rb
@@ -18,5 +18,12 @@ class KalibroClientTest < Test::Unit::TestCase
     @port.expects(:request).with(:process_project, {:project_name => name})
     @client.process_project(name)
   end
+
+  should 'instantiate for processing project' do
+    instance = mock
+    Kalibro::Client::KalibroClient.expects(:new).returns(instance)
+    instance.expects(:process_project).with('myproject')
+    Kalibro::Client::KalibroClient.process_project('myproject')
+  end
   
-end
\ No newline at end of file
+end
diff --git a/plugins/mezuro/test/unit/kalibro/client/project_client_test.rb b/plugins/mezuro/test/unit/kalibro/client/project_client_test.rb
index 56fe467..50bd77c 100644
--- a/plugins/mezuro/test/unit/kalibro/client/project_client_test.rb
+++ b/plugins/mezuro/test/unit/kalibro/client/project_client_test.rb
@@ -44,4 +44,12 @@ class ProjectClientTest < Test::Unit::TestCase
     @client.remove(name)
   end
 
-end
\ No newline at end of file
+  should 'instantiate for saving a project' do
+    project = mock
+    instance = mock
+    Kalibro::Client::ProjectClient.expects(:new).returns(instance)
+    instance.expects(:save).with(project)
+    Kalibro::Client::ProjectClient.save(project)
+  end
+
+end
diff --git a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
index ace0e14..8d391ea 100644
--- a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
+++ b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
@@ -34,13 +34,9 @@ class ProjectContentTest < Test::Unit::TestCase
   end
 
   should 'send correct project to service' do
-    project_client = mock
-    kalibro_client = mock
-    Kalibro::Client::ProjectClient.expects(:new).returns(project_client)
-    project_client.expects(:save).with(@project)
-    Kalibro::Client::KalibroClient.expects(:new).returns(kalibro_client)
-    kalibro_client.expects(:process_project).with(@project.name)
+    Kalibro::Client::ProjectClient.expects(:save).with(@project)
+    Kalibro::Client::KalibroClient.expects(:process_project).with(@project.name)
     @content.send :send_project_to_service
   end
 
-end
\ No newline at end of file
+end
--
libgit2 0.21.2