diff --git a/migration/repo.sh b/migration/repo.sh
index b86774d..46dd4f0 100755
--- a/migration/repo.sh
+++ b/migration/repo.sh
@@ -25,6 +25,7 @@ clean_tex()
 	bi=`basename "$i"`
 	echo -e "\e[1;34m>>>\e[1;37m Trying to convert $i to Markdown...\e[0m"
 
+	sed -Ei 's/\\includegraphics *\{([^}]+)}/\\verb+%%image(\1)+/gi' "$i"
 	sed -Ei 's/\\include *\{([^}]+)}/\\verb+%%scoped-include(\1)+/gi' "$i"
 	sed -Ei 's/\\input *\{([^}]+)}/\\verb+%%scoped-include(\1)+/gi' "$i"
 	sed -Ei 's/\{\\include *([^}]+)}/\\verb+%%scoped-include(\1)+/gi' "$i"
@@ -40,9 +41,10 @@ clean_tex()
 	sed -Ei 's/\\end *\{cartouche\}/\\end\{verbatim\}/g' "$i"
 	sed -Ei 's/\\begin *\{cartouche_nospaces\}/\\begin\{verbatim\}/g' "$i"
 	sed -Ei 's/\\end *\{cartouche_nospaces\}/\\end\{verbatim\}/g' "$i"
+	sed -Ei 's/\\verb ([^+]+) /\\verb+\1+/g' "$i"
 
 	# Special macros
-	sed -Ei 's/\\file *\{([^}]+)}/\\verb+\1+/gi' "$i"
+	sed -Ei 's/\\(file|email|command) *\{([^}]+)}/\\verb+\1+/gi' "$i"
 	sed -Ei 's/\\begin *\{assistant\}/\\verb+%%assistant-begin+/g' "$i"
 	sed -Ei 's/\\end *\{assistant\}/\\verb+%%assistant-end+/g' "$i"
 
@@ -70,6 +72,7 @@ clean_tex()
 	fi
 
 	sed -Ei 's/`%%([a-z-])\(([^)]+)\)`/%%\1(\2)/gi' "../${bi%%.tex}.md"
+	sed -Ei 's/\\$/\n/' "../${bi%%.tex}.md"
     done
     if [ `find | wc -l` -gt 1 ]
     then
@@ -150,7 +153,7 @@ then
     echo -e "\e[1;34m>>>\e[1;37m Creating moulette branch...\e[0m"
     git checkout -b moulette
     
-    find -mindepth 1 -maxdepth 1 ! -name moulette ! -name .git -exec git rm -rf {} \;
+    find -mindepth 1 -maxdepth 1 ! -name moulette ! -name tests ! -name .git -exec git rm -rf {} \;
 
     git rm -f moulette/DESC 2> /dev/null
     git commit -am "Converting HG to Git" > /dev/null
@@ -178,6 +181,7 @@ echo
 echo -e "\e[1;31m##\e[1;37m Removing old and temporary files \e[1;31m##\e[0m"
 git rm -f AUTHORS
 git rm -f README
+git rm -f UPDATE
 git rm -f Makefile
 git rm -f files/list
 git rm -f "files/*.pdf"
@@ -186,6 +190,7 @@ find -name 'ChangeLog' -exec git rm -fr {} \;
 find -name 'DESC' -exec git rm -fr {} \;
 find -name '*.old' -exec git rm -fr {} \;
 find -name '*.bak' -exec git rm -fr {} \;
+find -name '*.vrb' -exec git rm -fr {} \;
 find -name '*~' -exec git rm -fr {} \;
 find -name '#*#' -exec git rm -fr {} \;
 echo -e "\e[1;31m## ## ## ## ##\e[0m"
@@ -202,7 +207,7 @@ do
 	do
 	    if [ -f "$D/template.xml" ]
 	    then
-		~/new_intra/defenses/defense_converter.pl -o "$D.xml" "$D/template.xml"
+		`dirname $0`/defense_converter.pl -o "$D.xml" "$D/template.xml"
 		git add "$D.xml"
 		echo -e "\e[1;35m>>>\e[1;37m Defense converted:\e[0m $D"
 	    fi
@@ -219,6 +224,13 @@ do
 	echo -e "\e[1;36m## ## ## ## ##\e[0m"
 	echo
 
+    elif [ "$DIR" = "tests" ]
+    then
+	echo -e "\e[1;33m##\e[1;37m Find directory $DIR for moulette \e[1;33m##\e[0m"
+	git rm -rf "$DIR"
+	echo -e "\e[1;33m## ## ## ## ##\e[0m"
+	echo
+
     elif find "$DIR" -type f -name '*.yml' | grep yml > /dev/null
     then
 	echo -e "\e[1;33m##\e[1;37m Find directory $DIR with some .yml files \e[1;33m##\e[0m"