diff --git a/plugins/mezuro/script/delete_all_kalibro_entries.sh b/plugins/mezuro/script/delete_all_kalibro_entries.sh
index 8de084f..bc89db2 100755
--- a/plugins/mezuro/script/delete_all_kalibro_entries.sh
+++ b/plugins/mezuro/script/delete_all_kalibro_entries.sh
@@ -1,16 +1,5 @@
 #!/bin/bash
 
-DATABASE="kalibro_tests"
-USER="kalibro"
-PASSWORD="kalibro"
-MYSQL_PARAMS="$DATABASE -u $USER -p$PASSWORD"
-TABLES=($(mysql $MYSQL_PARAMS -e "show tables"))
-LENGTH=${#TABLES}
+DATABASE="kalibro_test"
 
-i=1
-while [ $i -le $LENGTH ]
-  do  if [ ${#TABLES[$i]} -ne 0 ]
-        then  mysql $MYSQL_PARAMS -e "SET FOREIGN_KEY_CHECKS = 0; delete from $DATABASE.${TABLES[$i]}; SET FOREIGN_KEY_CHECKS = 1;"
-      fi
-      i=$(($i+1))
-done
\ No newline at end of file
+sudo su postgres -c "export PGPASSWORD=\"kalibro\" && psql -q -t -d $DATABASE -c \"SELECT 'DELETE FROM ' || n.nspname || '.' || c.relname || ' CASCADE;' FROM pg_catalog.pg_class AS c LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE relkind = 'r' AND n.nspname NOT IN ('pg_catalog', 'pg_toast') AND pg_catalog.pg_table_is_visible(c.oid)\" | sed '/sequences/d' > /tmp/query && psql -q -d $DATABASE -f /tmp/query && rm /tmp/query"
diff --git a/plugins/mezuro/script/run_acceptance_tests.sh b/plugins/mezuro/script/run_acceptance_tests.sh
index 5a929d0..4b211bf 100755
--- a/plugins/mezuro/script/run_acceptance_tests.sh
+++ b/plugins/mezuro/script/run_acceptance_tests.sh
@@ -14,7 +14,7 @@ KALIBRO_HOME='/usr/share/tomcat6/.kalibro'
 echo "-->  Creating tests directory"
 sudo mkdir $KALIBRO_HOME/tests
 echo "-->  Copying test settings"
-sudo cp $KALIBRO_HOME/kalibro_tests.settings $KALIBRO_HOME/tests/kalibro.settings
+sudo cp $KALIBRO_HOME/kalibro_test.settings $KALIBRO_HOME/tests/kalibro.settings
 echo "-->  Changing owner of tests directory to tomcat6"
 sudo chown -R tomcat6:tomcat6 $KALIBRO_HOME/tests
 
diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
index f592b9f..ee63d9e 100644
--- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
@@ -28,7 +28,7 @@
   <br/>
 
   <% if owner %>
-    <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_metric_configuration", 
+    <%= link_to "#{image_tag('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_metric_configuration", 
   																			:profile => @page.profile.identifier, 
   																			:action => "choose_metric", 
   																			:id => @configuration_content.id %><br/>
--
libgit2 0.21.2