diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 0d9e1b9d8c6e525b31f88eaadaa79b7d4fc06c6b..23a2b342f5794437f792c343b141ae29eff5e0c8 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -39,7 +39,7 @@ class StatusMessagesController < ApplicationController
     
     respond_to do |format|
       format.html 
-      format.xml { render :xml => @status_message }
+      format.xml { render :xml => Post.build_xml_for(@status_message) }
       format.json { render :json => @status_message }
     end
   end
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 0b58ee72b5659407b26cf5ceb5ca9929409659a1..82dbc00c6741b5eb32f98ec0146acd1ef1ab7990 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -1,6 +1,5 @@
 class StatusMessage < Post
   include StatusMessagesHelper
-  require 'lib/net/curl'
  
   xml_name :status_message
  
@@ -19,9 +18,6 @@ class StatusMessage < Post
     StatusMessage.newest(User.first.email)
   end
 
-  def self.retrieve_from_friend(friend)
-    StatusMessages.from_xml Curl.get(friend.url+"status_messages.xml")
-  end
 
   def ==(other)
     (self.message == other.message) && (self.owner == other.owner)
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 69a870933c8c2f2bb3095e3ac375999fab85bfc3..4aa5f96ec4f88a037b144b6c5e0e1d21ed87fc51 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -29,5 +29,14 @@ Diaspora::Application.configure do
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
+
+
+begin
+ require 'database_cleaner'
+ DatabaseCleaner.strategy = :truncation
+ DatabaseCleaner.orm = "mongoid"
+rescue LoadError => ignore_if_database_cleaner_not_present
+ puts "Error on cleaner"
+end
   
 end