diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php
index ade6a4c692..d47a49934d 100644
--- a/tests/Unit/UserTest.php
+++ b/tests/Unit/UserTest.php
@@ -64,10 +64,10 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function firstInitialDotLastname()
+    public function testFirstInitialDotLastname()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'n.allanovnaromanovaoshostakova';
+        $expected_username = 'nallanovna-romanova-oshostakova';
         $user = User::generateFormattedNameFromFullName($fullname, 'firstinitial.lastname');
         $this->assertEquals($expected_username, $user['username']);
     }
@@ -80,23 +80,23 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function lastNameUnderscoreFirstInitial()
+    public function testLastNameUnderscoreFirstInitial()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'allanovnaromanovaoshostakova_n';
+        $expected_username = 'allanovna-romanova-oshostakova_n';
         $user = User::generateFormattedNameFromFullName($fullname, 'lastname_firstinitial');
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function firstNameLastName()
+    public function testFirstNameLastName()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'nataliaallanovnaromanovaoshostakova';
+        $expected_username = 'nataliaallanovna-romanova-oshostakova';
         $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastname');
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function firstNameLastInitial()
+    public function testFirstNameLastInitial()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
         $expected_username = 'nataliaa';