diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
index 24fcfd94..d3c5145b 100755
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
@@ -73,7 +73,7 @@ public class FreemindExporter
 
             final List<TopicType> topics = mindmapMap.getTopic();
 
-            // Insolated Topic doesn´t exists in Freemind only take the center topic
+            // Isolated Topic does not exist in Freemind only take the center topic
             TopicType centerTopic = null;
             if (topics.size() > 1) {
                 for (TopicType topic : topics) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
index 2842266a..b32c6a1c 100755
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java
@@ -24,16 +24,13 @@ import com.wisemapping.model.IconFamily;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 final public class FreemindIconConverter {
 
 
-    private final static Map<String, MindmapIcon> freeIdToIcon = new HashMap<String, MindmapIcon>();
-    private final static Map<MindmapIcon, String> iconToFreeId = new HashMap<MindmapIcon, String>();
+    private final static Map<String, MindmapIcon> freeIdToIcon = new TreeMap<String, MindmapIcon>();
+    private final static Map<MindmapIcon, String> iconToFreeId = new TreeMap<MindmapIcon, String>();
 
     private FreemindIconConverter() {
     }
diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
index 8ae02098..90061d6f 100755
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
@@ -94,7 +94,7 @@ public class FreemindImporter
 
     }
 
-    public MindMap importMap(String mapName, String description, InputStream input) throws ImporterException {
+    public MindMap importMap(@NotNull String mapName, @NotNull  String description, @NotNull InputStream input) throws ImporterException {
 
         final MindMap result = new MindMap();
         nodesMap = new HashMap<String, TopicType>();
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
index db6127cd..3839d309 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
@@ -29,6 +29,7 @@ package com.wisemapping.model;
 
 import com.wisemapping.util.ZipUtils;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.util.Calendar;
@@ -189,7 +190,7 @@ public class MindMap {
         return xml;
     }
 
-    public void setNativeXml(String nativeXml)
+    public void setNativeXml(@NotNull String nativeXml)
             throws IOException {
         this.xml = ZipUtils.stringToZip(nativeXml);
     }
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java
index 2145a1ab..5fdd6b74 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java
@@ -18,7 +18,7 @@
 
 package com.wisemapping.model;
 
-public class MindmapIcon {
+public class MindmapIcon implements Comparable{
     private String name;
     private IconFamily family;
 
@@ -38,4 +38,8 @@ public class MindmapIcon {
     public String getId() {
         return family.name().toLowerCase() + "_" + name;
     }
+
+    public int compareTo(Object o) {
+        return ((MindmapIcon)o).getId().compareTo(this.getId());
+    }
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
index 0c90fa66..de96a3cd 100755
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
@@ -203,7 +203,7 @@ public class MindmapIcons {
     private static void load() {
         try {
             if (iconsByFamily == null) {
-                iconsByFamily = new HashMap<IconFamily, List<MindmapIcon>>();
+                iconsByFamily = new TreeMap<IconFamily, List<MindmapIcon>>();
 
                 Field[] fields = MindmapIcons.class.getDeclaredFields();
                 for (Field field : fields) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java b/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java
index 937beb7d..d982da5e 100755
--- a/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java
@@ -54,9 +54,9 @@ public class JAXBUtils {
 
     }
 
-    public static void saveMap(@NotNull Object obj, @NotNull OutputStream out, String pachage) throws JAXBException {
+    public static void saveMap(@NotNull Object obj, @NotNull OutputStream out, String packag) throws JAXBException {
 
-        final JAXBContext context = getInstance(pachage);
+        final JAXBContext context = getInstance(packag);
         final Marshaller marshaller = context.createMarshaller();
 
         marshaller.marshal(obj, out);
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java b/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
index 13d80a89..6413b02c 100755
--- a/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
+++ b/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java
@@ -40,7 +40,7 @@ public class ZipUtils {
             byte[] buffer = new byte[512];
 
             int len;
-            StringBuffer sb_result = new StringBuffer();
+            StringBuilder sb_result = new StringBuilder();
 
             while ((len = zipIn.read(buffer)) > 0) {
 
diff --git a/wise-webapp/src/test/data/freemind/icons.wxml b/wise-webapp/src/test/data/freemind/icons.wxml
index 449372e1..a0b38727 100644
--- a/wise-webapp/src/test/data/freemind/icons.wxml
+++ b/wise-webapp/src/test/data/freemind/icons.wxml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,-200" order="7" shape="line" text="Simbols"><topic id="2" position="290,-300" order="0" shape="line" text="Warning"><icon id="sign_warning"/></topic><topic id="3" position="290,-275" order="1" shape="line" text="No Ok"><icon id="tick_cross"/></topic><topic id="4" position="290,-250" order="2" shape="line" text="Ok"><icon id="tick_tick"/></topic><topic id="5" position="290,-225" order="3" shape="line" text="Info"><icon id="sign_info"/></topic><topic id="6" position="290,-200" order="4" shape="line" text="No Entry"><icon id="onoff_delete"/></topic><topic id="7" position="290,-175" order="5" shape="line" text="Stop"><icon id="sign_stop"/></topic><topic id="8" position="290,-150" order="6" shape="line" text="Lamp"><icon id="bulb_light_on"/></topic><topic id="9" position="290,-125" order="7" shape="line" text="! Simbol"/><topic id="10" position="290,-100" order="8" shape="line" text="Question Mark"><icon id="sign_help"/></topic></topic><topic shrink="true" id="11" position="-200,-200" order="7" shape="line" text="Numbers"><topic id="12" position="-290,-325" order="0" shape="line" text="1"><icon id="bullet_blue"/></topic><topic id="13" position="-290,-300" order="1" shape="line" text="2"><icon id="bullet_green"/></topic><topic id="14" position="-290,-275" order="2" shape="line" text="3"><icon id="bullet_orange"/></topic><topic id="15" position="-290,-250" order="3" shape="line" text="4"><icon id="bullet_red"/></topic><topic id="16" position="-290,-225" order="4" shape="line" text="5"><icon id="bullet_pink"/></topic><topic id="17" position="-290,-200" order="5" shape="line" text="6"><icon id="bullet_purple"/></topic><topic id="18" position="-290,-175" order="6" shape="line" text="7"/><topic id="19" position="-290,-150" order="7" shape="line" text="8"/><topic id="20" position="-290,-125" order="8" shape="line" text="9"/><topic id="21" position="-290,-100" order="9" shape="line" text="0"><icon id="bullet_black"/></topic></topic><topic id="22" position="200,-100" order="3" shape="line" text="Trafic"><topic id="23" position="290,-125" order="0" shape="line" text="Read"/><topic id="24" position="290,-100" order="1" shape="line" text="Green"/><topic id="25" position="290,-75" order="2" shape="line" text="Yellow"/></topic><topic shrink="true" id="26" position="-200,-100" order="3" shape="line" text="Arrow"><topic id="27" position="-290,-150" order="0" shape="line" text="Back"><icon id="arrow_right"/></topic><topic id="28" position="-290,-125" order="1" shape="line" text="Forward"><icon id="arrow_left"/></topic><topic id="29" position="-290,-100" order="2" shape="line" text="Up"><icon id="arrow_up"/></topic><topic id="30" position="-290,-75" order="3" shape="line" text="Down"><icon id="arrow_down"/></topic></topic><topic shrink="true" id="31" position="200,0" order="0" shape="line" text="Smiles"><topic id="32" position="290,-50" order="0" shape="line" text="Smile"><icon id="face_smile"/></topic><topic id="33" position="290,-25" order="1" shape="line" text="No Mind"><icon id="face_plain"/></topic><topic id="34" position="290,0" order="2" shape="line" text="Surprise"><icon id="face_surprise"/></topic><topic id="35" position="290,25" order="3" shape="line" text="Sad"/><topic id="36" position="290,50" order="4" shape="line" text="Angry"/></topic><topic shrink="true" id="37" position="-200,0" order="0" shape="line" text="People"><topic id="38" position="-290,-75" order="0" shape="line" text="Family"/><topic id="39" position="-290,-50" order="1" shape="line" text="Female1"><icon id="people_female1"/></topic><topic id="40" position="-290,-25" order="2" shape="line" text="Female2"><icon id="people_female2"/></topic><topic id="41" position="-290,0" order="3" shape="line" text="Male1"><icon id="people_male1"/></topic><topic id="42" position="-290,25" order="4" shape="line" text="Male2"><icon id="people_male2"/></topic><topic id="43" position="-290,50" order="5" shape="line" text="Females"/><topic id="44" position="-290,75" order="6" shape="line" text="Group"><icon id="people_group"/></topic></topic><topic shrink="true" id="45" position="200,100" order="4" shape="line" text="Flags"><topic id="46" position="290,25" order="0" shape="line" text="Black"/><topic id="47" position="290,50" order="1" shape="line" text="Blue"><icon id="flag_blue"/></topic><topic id="48" position="290,75" order="2" shape="line" text="Green"><icon id="flag_green"/></topic><topic id="49" position="290,100" order="3" shape="line" text="Orange"><icon id="flag_orange"/></topic><topic id="50" position="290,125" order="4" shape="line" text="Pink"><icon id="flag_pink"/></topic><topic id="51" position="290,150" order="5" shape="line" text="Red"/><topic id="52" position="290,175" order="6" shape="line" text="Yellow"><icon id="flag_yellow"/></topic></topic><topic shrink="true" id="53" position="-200,100" order="4" shape="line" text="Time"><topic id="54" position="-290,75" order="0" shape="line" text="Calendar"><icon id="time_calendar"/></topic><topic id="55" position="-290,100" order="1" shape="line" text="Digial Clock"><icon id="time_clock"/></topic><topic id="56" position="-290,125" order="2" shape="line" text="Hourglass"><icon id="time_hourglass"/></topic></topic><topic id="57" position="200,200" order="8" shape="line" text="Suff"><topic id="58" position="290,0" order="0" shape="line" text="Broken"/><topic id="59" position="290,25" order="1" shape="line" text="WiseIcon"/><topic id="60" position="290,50" order="2" shape="line" text="ICQ/Flower"><icon id="onoff_status_online"/></topic><topic id="61" position="290,75" order="3" shape="line" text="Linux/Pinguin"><icon id="soft_penguin"/></topic><topic id="62" position="290,100" order="4" shape="line" text="Star"><icon id="object_star"/></topic><topic id="63" position="290,125" order="5" shape="line" text="Reminder"><icon id="object_bell"/></topic><topic id="64" position="290,150" order="6" shape="line" text="Zoom"><icon id="object_magnifier"/></topic><topic id="65" position="290,175" order="7" shape="line" text="Magic"><icon id="object_wizard"/></topic><topic id="66" position="290,200" order="8" shape="line" text="Music"><icon id="object_music"/></topic><topic id="67" position="290,225" order="9" shape="line" text="Pen"><icon id="object_pencil"/></topic><topic id="68" position="290,250" order="10" shape="line" text="Key"><icon id="object_key"/></topic><topic id="69" position="290,275" order="11" shape="line" text="House"><icon id="object_house"/></topic><topic id="70" position="290,300" order="12" shape="line" text="Phone"><icon id="object_phone"/></topic><topic id="71" position="290,325" order="13" shape="line" text="Do not Forget"/><topic id="72" position="290,350" order="14" shape="line" text="Bomb"><icon id="object_clanbomber"/></topic><topic id="73" position="290,375" order="15" shape="line" text="Clip"><icon id="object_clip"/></topic></topic><topic id="74" position="-200,200" order="8" shape="line" text="Mail"><topic id="75" position="-290,150" order="0" shape="line" text="Envelop"><icon id="mail_envelop"/></topic><topic id="76" position="-290,175" order="1" shape="line" text="E-Mail"/><topic id="77" position="-290,200" order="2" shape="line" text="List"><icon id="mail_list"/></topic><topic id="78" position="-290,225" order="3" shape="line" text="Refine"><icon id="mail_edit"/></topic><topic id="79" position="-290,250" order="4" shape="line" text="Mailbox"><icon id="mail_mailbox"/></topic></topic></topic></map>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,-200" order="7" shape="line" text="Simbols"><topic id="2" position="290,-300" order="0" shape="line" text="Warning"><icon id="sign_warning"/></topic><topic id="3" position="290,-275" order="1" shape="line" text="No Ok"><icon id="tick_cross"/></topic><topic id="4" position="290,-250" order="2" shape="line" text="Ok"><icon id="tick_tick"/></topic><topic id="5" position="290,-225" order="3" shape="line" text="Info"><icon id="sign_info"/></topic><topic id="6" position="290,-200" order="4" shape="line" text="No Entry"><icon id="onoff_delete"/></topic><topic id="7" position="290,-175" order="5" shape="line" text="Stop"><icon id="sign_stop"/></topic><topic id="8" position="290,-150" order="6" shape="line" text="Lamp"><icon id="bulb_light_on"/></topic><topic id="9" position="290,-125" order="7" shape="line" text="! Simbol"/><topic id="10" position="290,-100" order="8" shape="line" text="Question Mark"><icon id="sign_help"/></topic></topic><topic shrink="true" id="11" position="-200,-200" order="7" shape="line" text="Numbers"><topic id="12" position="-290,-325" order="0" shape="line" text="1"><icon id="bullet_blue"/></topic><topic id="13" position="-290,-300" order="1" shape="line" text="2"><icon id="bullet_green"/></topic><topic id="14" position="-290,-275" order="2" shape="line" text="3"><icon id="bullet_orange"/></topic><topic id="15" position="-290,-250" order="3" shape="line" text="4"><icon id="bullet_red"/></topic><topic id="16" position="-290,-225" order="4" shape="line" text="5"><icon id="bullet_pink"/></topic><topic id="17" position="-290,-200" order="5" shape="line" text="6"><icon id="bullet_purple"/></topic><topic id="18" position="-290,-175" order="6" shape="line" text="7"/><topic id="19" position="-290,-150" order="7" shape="line" text="8"/><topic id="20" position="-290,-125" order="8" shape="line" text="9"/><topic id="21" position="-290,-100" order="9" shape="line" text="0"><icon id="bullet_black"/></topic></topic><topic id="22" position="200,-100" order="3" shape="line" text="Trafic"><topic id="23" position="290,-125" order="0" shape="line" text="Read"/><topic id="24" position="290,-100" order="1" shape="line" text="Green"/><topic id="25" position="290,-75" order="2" shape="line" text="Yellow"/></topic><topic shrink="true" id="26" position="-200,-100" order="3" shape="line" text="Arrow"><topic id="27" position="-290,-150" order="0" shape="line" text="Back"><icon id="arrow_right"/></topic><topic id="28" position="-290,-125" order="1" shape="line" text="Forward"><icon id="arrow_left"/></topic><topic id="29" position="-290,-100" order="2" shape="line" text="Up"><icon id="arrow_up"/></topic><topic id="30" position="-290,-75" order="3" shape="line" text="Down"><icon id="arrow_down"/></topic></topic><topic shrink="true" id="31" position="200,0" order="0" shape="line" text="Smiles"><topic id="32" position="290,-50" order="0" shape="line" text="Smile"><icon id="face_smile"/></topic><topic id="33" position="290,-25" order="1" shape="line" text="No Mind"><icon id="face_plain"/></topic><topic id="34" position="290,0" order="2" shape="line" text="Surprise"><icon id="face_surprise"/></topic><topic id="35" position="290,25" order="3" shape="line" text="Sad"/><topic id="36" position="290,50" order="4" shape="line" text="Angry"/></topic><topic shrink="true" id="37" position="-200,0" order="0" shape="line" text="People"><topic id="38" position="-290,-75" order="0" shape="line" text="Family"/><topic id="39" position="-290,-50" order="1" shape="line" text="Female1"><icon id="people_female1"/></topic><topic id="40" position="-290,-25" order="2" shape="line" text="Female2"><icon id="people_female2"/></topic><topic id="41" position="-290,0" order="3" shape="line" text="Male1"><icon id="people_male1"/></topic><topic id="42" position="-290,25" order="4" shape="line" text="Male2"><icon id="people_male2"/></topic><topic id="43" position="-290,50" order="5" shape="line" text="Females"/><topic id="44" position="-290,75" order="6" shape="line" text="Group"><icon id="people_group"/></topic></topic><topic shrink="true" id="45" position="200,100" order="4" shape="line" text="Flags"><topic id="46" position="290,25" order="0" shape="line" text="Black"/><topic id="47" position="290,50" order="1" shape="line" text="Blue"><icon id="flag_blue"/></topic><topic id="48" position="290,75" order="2" shape="line" text="Green"><icon id="flag_green"/></topic><topic id="49" position="290,100" order="3" shape="line" text="Orange"><icon id="flag_orange"/></topic><topic id="50" position="290,125" order="4" shape="line" text="Pink"><icon id="flag_pink"/></topic><topic id="51" position="290,150" order="5" shape="line" text="Red"/><topic id="52" position="290,175" order="6" shape="line" text="Yellow"><icon id="flag_yellow"/></topic></topic><topic shrink="true" id="53" position="-200,100" order="4" shape="line" text="Time"><topic id="54" position="-290,75" order="0" shape="line" text="Calendar"><icon id="time_calendar"/></topic><topic id="55" position="-290,100" order="1" shape="line" text="Digial Clock"><icon id="onoff_clock"/></topic><topic id="56" position="-290,125" order="2" shape="line" text="Hourglass"><icon id="time_hourglass"/></topic></topic><topic id="57" position="200,200" order="8" shape="line" text="Suff"><topic id="58" position="290,0" order="0" shape="line" text="Broken"/><topic id="59" position="290,25" order="1" shape="line" text="WiseIcon"/><topic id="60" position="290,50" order="2" shape="line" text="ICQ/Flower"><icon id="onoff_status_online"/></topic><topic id="61" position="290,75" order="3" shape="line" text="Linux/Pinguin"><icon id="soft_penguin"/></topic><topic id="62" position="290,100" order="4" shape="line" text="Star"><icon id="object_star"/></topic><topic id="63" position="290,125" order="5" shape="line" text="Reminder"><icon id="object_bell"/></topic><topic id="64" position="290,150" order="6" shape="line" text="Zoom"><icon id="object_magnifier"/></topic><topic id="65" position="290,175" order="7" shape="line" text="Magic"><icon id="object_wizard"/></topic><topic id="66" position="290,200" order="8" shape="line" text="Music"><icon id="object_music"/></topic><topic id="67" position="290,225" order="9" shape="line" text="Pen"><icon id="object_pencil"/></topic><topic id="68" position="290,250" order="10" shape="line" text="Key"><icon id="object_key"/></topic><topic id="69" position="290,275" order="11" shape="line" text="House"><icon id="object_house"/></topic><topic id="70" position="290,300" order="12" shape="line" text="Phone"><icon id="object_phone"/></topic><topic id="71" position="290,325" order="13" shape="line" text="Do not Forget"/><topic id="72" position="290,350" order="14" shape="line" text="Bomb"><icon id="object_clanbomber"/></topic><topic id="73" position="290,375" order="15" shape="line" text="Clip"><icon id="object_clip"/></topic></topic><topic id="74" position="-200,200" order="8" shape="line" text="Mail"><topic id="75" position="-290,150" order="0" shape="line" text="Envelop"><icon id="mail_envelop"/></topic><topic id="76" position="-290,175" order="1" shape="line" text="E-Mail"/><topic id="77" position="-290,200" order="2" shape="line" text="List"><icon id="mail_list"/></topic><topic id="78" position="-290,225" order="3" shape="line" text="Refine"><icon id="mail_edit"/></topic><topic id="79" position="-290,250" order="4" shape="line" text="Mailbox"><icon id="mail_mailbox"/></topic></topic></topic></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/relationships.mm b/wise-webapp/src/test/data/freemind/relationships.mm_disable
similarity index 100%
rename from wise-webapp/src/test/data/freemind/relationships.mm
rename to wise-webapp/src/test/data/freemind/relationships.mm_disable
diff --git a/wise-webapp/src/test/data/freemind/relationships.mmr b/wise-webapp/src/test/data/freemind/relationships.mmr
deleted file mode 100644
index 36175480..00000000
--- a/wise-webapp/src/test/data/freemind/relationships.mmr
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="eeeeeeeeeee" ID="ID_0" COLOR="#000000"><font SIZE="10" NAME="Arial"/><hook NAME="accessories/plugins/NodeNote.properties"><text>
-                </text></hook><node wORDER="7" wCOORDS="200,-200" TEXT="interne" POSITION="right" ID="ID_1" COLOR="#cc0000"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" wCOORDS="290,-225" TEXT="faiblesses" POSITION="right" ID="ID_2" COLOR="#330033"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node></node><node wORDER="3" wCOORDS="200,-100" TEXT="www.luxuo.com" POSITION="right" LINK="www.luxuo.com" ID="ID_3"><arrowlink ENDARROW="Default" DESTINATION="ID_6"/></node><node wORDER="0" wCOORDS="200,0" TEXT="" POSITION="right" ID="ID_4"/><node wORDER="4" wCOORDS="200,100" TEXT="forces" POSITION="right" ID="ID_5" COLOR="#003333"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="8" wCOORDS="200,200" TEXT="" POSITION="right" ID="ID_6"><hook NAME="accessories/plugins/NodeNote.properties"><text>%5El%3A%5El%3A%5El
-                    </text></hook></node><node wORDER="12" wCOORDS="200,300" TEXT="" POSITION="right" ID="ID_7"><node wORDER="0" wCOORDS="290,275" TEXT="externe" POSITION="right" ID="ID_8" COLOR="#000066"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" wCOORDS="380,250" TEXT="opportunit?s" POSITION="right" ID="ID_9" COLOR="#ff3300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="1" wCOORDS="380,275" TEXT="menaces" POSITION="right" ID="ID_10" COLOR="#333300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><arrowlink ENDARROW="Default" DESTINATION="ID_0"/></node></node><arrowlink ENDARROW="Default" DESTINATION="ID_5"/></node></node></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/data/freemind/relationships.wxml b/wise-webapp/src/test/data/freemind/relationships.wxml
deleted file mode 100644
index 75158507..00000000
--- a/wise-webapp/src/test/data/freemind/relationships.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" fontStyle="Arial;10;#000000;;;" shape="rounded rectagle" text="eeeeeeeeeee"><note text="%0A                "/><topic id="1" position="200,-200" order="7" fontStyle="Arial;12;#cc0000;bold;italic;" shape="line" text="interne"><topic id="2" position="290,-225" order="0" fontStyle="Arial;12;#330033;bold;italic;" shape="line" text="faiblesses"/></topic><topic id="3" position="200,-100" order="3" shape="line" text="www.luxuo.com"><link url="www.luxuo.com"/></topic><topic id="4" position="200,0" order="0" shape="line" text=""/><topic id="5" position="200,100" order="4" fontStyle="Arial;12;#003333;bold;italic;" shape="line" text="forces"/><topic id="6" position="200,200" order="8" shape="line" text=""><note text="%5El%3A%5El%3A%5El%0A                    "/></topic><topic id="7" position="200,300" order="12" shape="line" text=""><topic id="8" position="290,275" order="0" fontStyle="Arial;12;#000066;bold;italic;" shape="line" text="externe"><topic id="9" position="380,250" order="0" fontStyle="Arial;12;#ff3300;bold;italic;" shape="line" text="opportunit?s"/><topic id="10" position="380,275" order="1" fontStyle="Arial;12;#333300;bold;italic;" shape="line" text="menaces"/></topic></topic></topic><relationship startArrow="false" endArrow="true" destCtrlPoint="108,0" srcCtrlPoint="108,0" lineType="3" destTopicId="6" srcTopicId="3" id="11"/><relationship startArrow="false" endArrow="true" destCtrlPoint="63,0" srcCtrlPoint="63,0" lineType="3" destTopicId="5" srcTopicId="7" id="12"/><relationship startArrow="false" endArrow="true" destCtrlPoint="211,0" srcCtrlPoint="211,0" lineType="3" destTopicId="0" srcTopicId="10" id="13"/></map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/freemind/FreemindExportTest.java b/wise-webapp/src/test/java/com/wisemapping/test/freemind/FreemindExportTest.java
index 7ea205c3..f5ad226e 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/freemind/FreemindExportTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/freemind/FreemindExportTest.java
@@ -44,7 +44,7 @@ public class FreemindExportTest {
             // Export mile content ...
             final ByteArrayOutputStream bos = new ByteArrayOutputStream();
             freemindExporter.export(mindmap, bos);
-            final String exportContent = new String(bos.toByteArray());
+            final String exportContent = new String(bos.toByteArray(),"UTF-8");
 
             Assert.assertEquals(recContent.toString(), exportContent);
 
@@ -72,7 +72,7 @@ public class FreemindExportTest {
         fis.close();
 
         final MindMap result = new MindMap();
-        result.setXml(content.toString().getBytes());
+        result.setXml(content.toString().getBytes("UTF-8"));
         result.setNativeXml(content.toString());
         return result;
     }
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/freemind/ImportExportTest.java b/wise-webapp/src/test/java/com/wisemapping/test/freemind/ImportExportTest.java
index 015a972e..34ea6786 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/freemind/ImportExportTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/freemind/ImportExportTest.java
@@ -29,7 +29,7 @@ public class ImportExportTest {
 
 
     @Test(dataProvider = "Data-Provider-Function")
-    public void exportImportExportTest(@NotNull final File freeMindFile, @NotNull final File wiseFile, @NotNull final File freeRecFile) throws ImporterException, IOException, ExportException {
+    public void exportImportTest(@NotNull final File freeMindFile, @NotNull final File wiseFile, @NotNull final File freeRecFile) throws ImporterException, IOException, ExportException {
 
 
         final FileInputStream fileInputStream = new FileInputStream(freeMindFile.getAbsolutePath());
@@ -46,7 +46,7 @@ public class ImportExportTest {
 
         } else {
             final FileOutputStream fos = new FileOutputStream(wiseFile);
-            fos.write(mindMap.getUnzippedXml().getBytes());
+            fos.write(mindMap.getUnzippedXml().getBytes("UTF-8"));
             fos.close();
         }
 
@@ -55,12 +55,11 @@ public class ImportExportTest {
             // Compare rec and file ...
             final String recContent = readFile(freeRecFile);
 
-            // Export mile content ...
+            // Export content ...
             final ByteArrayOutputStream bos = new ByteArrayOutputStream();
             exporter.export(mindMap, bos);
-            final String exportContent = new String(bos.toByteArray());
 
-            Assert.assertEquals(exportContent, recContent);
+            Assert.assertEquals(bos.toByteArray(), recContent.getBytes("UTF-8"));
 
         } else {
             final FileOutputStream fos = new FileOutputStream(freeRecFile);
@@ -92,11 +91,13 @@ public class ImportExportTest {
     @DataProvider(name = "Data-Provider-Function")
     public Object[][] parameterIntTestProvider() {
 
+        final String testNameToRun = System.getProperty("wise.test.name");
+
         final File dataDir = new File(DATA_DIR_PATH);
         final File[] freeMindFiles = dataDir.listFiles(new FilenameFilter() {
 
             public boolean accept(File dir, String name) {
-                return name.endsWith(".mm");
+                return name.endsWith(".mm") && (testNameToRun==null || name.startsWith(testNameToRun));
             }
         });
 
diff --git a/wise-webapp/src/test/sql/mysql/create-schemas.sql b/wise-webapp/src/test/sql/mysql/create-schemas.sql
index d1c7e6f4..5ff9de9f 100644
--- a/wise-webapp/src/test/sql/mysql/create-schemas.sql
+++ b/wise-webapp/src/test/sql/mysql/create-schemas.sql
@@ -14,7 +14,7 @@ password varchar(255) CHARACTER SET utf8 NOT NULL,
 activationCode BIGINT(20) NOT NULL,
 activation_date date,
 allowSendEmail char(1) CHARACTER SET utf8 NOT NULL default 0,
-FOREIGN KEY(colaborator_id) REFERENCES colaborator(id)
+FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE MINDMAP (
@@ -31,7 +31,7 @@ tags varchar(1014) CHARACTER SET utf8 ,
 last_editor varchar(255) CHARACTER SET utf8 ,
 creator_user varchar(255) CHARACTER SET utf8 ,
 editor_properties varchar(512) CHARACTER SET utf8 ,
-FOREIGN KEY(owner_id) REFERENCES user(colaborator_id)
+FOREIGN KEY(owner_id) REFERENCES USER(colaborator_id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE MINDMAP_NATIVE
@@ -55,15 +55,15 @@ id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
 colaborator_id INTEGER NOT NULL,
 mindmap_id INTEGER NOT NULL,
 role_id INTEGER NOT NULL,
-FOREIGN KEY(colaborator_id) REFERENCES colaborator(id),
-FOREIGN KEY(mindmap_id) REFERENCES mindmap(id)
+FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id),
+FOREIGN KEY(mindmap_id) REFERENCES MINDMAP(id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE TAG(
 id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
 name varchar(255) CHARACTER SET utf8 NOT NULL,
 user_id INTEGER NOT NULL,
-FOREIGN KEY(user_id) REFERENCES user(colaborator_id)
+FOREIGN KEY(user_id) REFERENCES USER(colaborator_id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE USER_LOGIN (