diff --git a/Tests/markdownTest.php b/Tests/markdownTest.php
index 417e276..45bd12a 100644
--- a/Tests/markdownTest.php
+++ b/Tests/markdownTest.php
@@ -138,11 +138,26 @@ class test_markdown extends PHPUnit_Framework_TestCase
   }
 
   public function testEmphasisEM2 ()
+  {
+    $this->expectOutputString("<p><em>file1.php</em> or <em>file2.php</em></p>");
+    $md = new markdown ();
+    printf ($md->html ("_file1.php_ or _file2.php_"));
+  }
+
+  public function testEmphasisEM3 ()
   {
     $this->expectOutputString("<p><em>text</em></p>");
     $md = new markdown ();
     printf ($md->html ("*text*"));
   }
+
+  public function testEmphasisEM4 ()
+  {
+    $this->expectOutputString("<p><em>text</em> or <em>text2</em></p>");
+    $md = new markdown ();
+    printf ($md->html ("*text* or *text2*"));
+  }
+
   //   Unnumbered lists
   public function testUnnumbered1 ()
   {
@@ -261,7 +276,7 @@ base</code></pre>");
   public function testLinkHTTP3 ()
   {
     $this->expectOutputString(
-             "<p><a href='mailto://test@example.com'>test@example.com</a></p>");
+             "<p><a href='mailto:test@example.com'>test@example.com</a></p>");
     $md = new markdown ();
     printf ($md->html ("<test@example.com>"));
   }
@@ -295,13 +310,6 @@ base</code></pre>");
 end"));
   }
 
-  public function testUnderscore ()
-  {
-    $this->expectOutputString("<p><em>file1.php</em> or <em>file2.php</em></p>");
-    $md = new markdown ();
-    printf ($md->html ("_file1.php_ or _file2.php_"));
-  }
-
   public function testCarriageReturn1 ()
   {
     $this->expectOutputString("<p>line1 line2</p>");