diff --git a/src/main/java/ic/doc/web/HtmlConverter.java b/src/main/java/ic/doc/web/HtmlConverter.java
index 5394c1b06be5748efe180630896af414974d1242..8a49bb46b0df07056f3dfa48bb099039e32828e1 100644
--- a/src/main/java/ic/doc/web/HtmlConverter.java
+++ b/src/main/java/ic/doc/web/HtmlConverter.java
@@ -34,7 +34,8 @@ public class HtmlConverter {
         }
 
         try {
-            String pdfFilePath = mdFile.getCanonicalPath() + ".pdf";
+            String canocialPath = mdFile.getCanonicalPath();
+            String pdfFilePath = canocialPath.substring(0, canocialPath.length() - 3) + ".pdf";
             new ProcessBuilder("pandoc", mdFile.getCanonicalPath(), "-o", pdfFilePath)
                     .start().waitFor();
 
diff --git a/src/test/java/ic/doc/FileGenerateTest.java b/src/test/java/ic/doc/FileGenerateTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9736e864cbedbc769ad0130253ea792fcfe1087a
--- /dev/null
+++ b/src/test/java/ic/doc/FileGenerateTest.java
@@ -0,0 +1,34 @@
+package ic.doc;
+
+import ic.doc.web.HtmlConverter;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class FileGenerateTest {
+
+  @Test
+  public void generatesMdFile() throws Exception {
+    assertTrue(HtmlConverter.stringToMdFile("tony", "test") != null);
+  }
+
+  @Test
+  public void generatesPdfFile() throws Exception {
+    assertTrue(HtmlConverter.stringToPdfFile("tony", "test") != null);
+  }
+
+  @Test
+  public void reasonableNameForMdFile() throws Exception {
+    assertTrue(
+        HtmlConverter.stringToMdFile("konstantinos", "test")
+            .getName()
+            .matches("konstantinos[0-9]+.md"));
+  }
+
+  @Test
+  public void reasonableNameForPdfFile() throws Exception {
+    assertTrue(HtmlConverter.stringToPdfFile("tony", "test")
+              .getName()
+              .matches("tony[0-9]+.pdf"));
+  }
+}