diff --git a/lib/Siba.jar b/lib/Siba.jar
deleted file mode 100755
index 7fb5b2d..0000000
Binary files a/lib/Siba.jar and /dev/null differ
diff --git a/lib/Siba.sh b/lib/Siba.sh
deleted file mode 100755
index 5bd0659..0000000
--- a/lib/Siba.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh 
- java -jar Siba.jar $1 $2 $3 $4
-
diff --git a/test/org/dclermonte/siba/model/SibaManagerTest.java b/test/org/dclermonte/siba/model/SibaManagerTest.java
index 6f459c2..03e4ff1 100644
--- a/test/org/dclermonte/siba/model/SibaManagerTest.java
+++ b/test/org/dclermonte/siba/model/SibaManagerTest.java
@@ -28,8 +28,11 @@ public class SibaManagerTest
     /**
      *
      * @throws IOException
+     *             IOException
      * @throws ArchiveException
-     * @throws SibaNullException
+     *             ArchiveException
+     * @throws SibaException
+     *             specific sibaException
      */
     @Test(expectedExceptions = SibaException.class)
     public void backupTest01() throws ArchiveException, IOException, SibaException
@@ -38,33 +41,56 @@ public class SibaManagerTest
     }
 
     /**
+     * Test the archive generated
      *
      * @throws ArchiveException
+     *             ArchiveException
      * @throws IOException
-     * @throws SibaNullException
+     *             IOException
+     * @throws SibaException
+     *             specific sibaException
      */
     @Test
     public void backupTest02() throws ArchiveException, IOException, SibaException
     {
         File source = new File("test/org/dclermonte/siba/data/simplestuff");
-        File target = SibaManager.backup(source, new File("test/org/dclermonte/siba/data/result"));
 
+        File target = SibaManager.backup(source, new File(System.getProperty("java.io.tmpdir")));
         File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz");
+
         Boolean fileEquals = FileUtils.contentEquals(reference, target);
+
+        File targetMD5 = new File(target.getAbsolutePath() + ".md5");
+        target.delete();
+        targetMD5.delete();
         // Test.
         Assert.assertTrue(fileEquals);
     }
 
+    /**
+     * Test the md5 calculation
+     *
+     * @throws ArchiveException
+     *             Archive Exception
+     * @throws IOException
+     *             IOException
+     * @throws SibaException
+     *             specific sibaException
+     * @throws NoSuchAlgorithmException
+     *             NosuchAlgorithmException
+     */
     @Test
     public void backupTest03() throws ArchiveException, IOException, SibaException, NoSuchAlgorithmException
     {
-        File source = new File("test/org/dclermonte/siba/data/simplestuff");
-        File target = SibaManager.backup(source, new File("test/org/dclermonte/siba/data/result"));
-        String md5Calculate = SibaUtils.md5(target);
+        File source = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz");
+
+        String md5Calculate = SibaUtils.md5(source);
 
         File reference = new File("test/org/dclermonte/siba/data/reference/simplestuff-2016-08-30T22h44mn21s.tgz.md5");
         String md5Reference = SibaUtils.loadMD5Sum(reference);
+
         // Test.
         Assert.assertEquals(md5Calculate, md5Reference);
+
     }
 }