diff --git a/Behavioral/Command/Tests/CommandTest.php b/Behavioral/Command/Tests/CommandTest.php
index fa2e835..2479321 100644
--- a/Behavioral/Command/Tests/CommandTest.php
+++ b/Behavioral/Command/Tests/CommandTest.php
@@ -16,6 +16,6 @@ class CommandTest extends TestCase
 
         $invoker->setCommand(new HelloCommand($receiver));
         $invoker->run();
-        $this->assertEquals($receiver->getOutput(), 'Hello World');
+        $this->assertEquals('Hello World', $receiver->getOutput());
     }
 }
diff --git a/Behavioral/Command/Tests/UndoableCommandTest.php b/Behavioral/Command/Tests/UndoableCommandTest.php
index 708c736..9569cb1 100644
--- a/Behavioral/Command/Tests/UndoableCommandTest.php
+++ b/Behavioral/Command/Tests/UndoableCommandTest.php
@@ -17,17 +17,17 @@ class UndoableCommandTest extends TestCase
 
         $invoker->setCommand(new HelloCommand($receiver));
         $invoker->run();
-        $this->assertEquals($receiver->getOutput(), 'Hello World');
+        $this->assertEquals('Hello World', $receiver->getOutput());
 
         $messageDateCommand = new AddMessageDateCommand($receiver);
         $messageDateCommand->execute();
 
         $invoker->run();
-        $this->assertEquals($receiver->getOutput(), "Hello World\nHello World [".date('Y-m-d').']');
+        $this->assertEquals("Hello World\nHello World [".date('Y-m-d').']', $receiver->getOutput());
 
         $messageDateCommand->undo();
 
         $invoker->run();
-        $this->assertEquals($receiver->getOutput(), "Hello World\nHello World [".date('Y-m-d')."]\nHello World");
+        $this->assertEquals("Hello World\nHello World [".date('Y-m-d')."]\nHello World", $receiver->getOutput());
     }
 }
diff --git a/Behavioral/Strategy/Tests/StrategyTest.php b/Behavioral/Strategy/Tests/StrategyTest.php
index a310910..cf1f7f3 100644
--- a/Behavioral/Strategy/Tests/StrategyTest.php
+++ b/Behavioral/Strategy/Tests/StrategyTest.php
@@ -23,7 +23,7 @@ class StrategyTest extends TestCase
         ];
     }
 
-    public function providateDates()
+    public function provideDates()
     {
         return [
             [
@@ -54,7 +54,7 @@ class StrategyTest extends TestCase
     }
 
     /**
-     * @dataProvider providateDates
+     * @dataProvider provideDates
      *
      * @param array $collection
      * @param array $expected
diff --git a/More/Repository/Tests/RepositoryTest.php b/More/Repository/Tests/RepositoryTest.php
index c3b77c9..9bd2b80 100644
--- a/More/Repository/Tests/RepositoryTest.php
+++ b/More/Repository/Tests/RepositoryTest.php
@@ -7,7 +7,7 @@ use DesignPatterns\More\Repository\Post;
 use DesignPatterns\More\Repository\PostRepository;
 use PHPUnit\Framework\TestCase;
 
-class Repository extends TestCase
+class RepositoryTest extends TestCase
 {
     public function testCanPersistAndFindPost()
     {
diff --git a/locale/pt_BR/LC_MESSAGES/Behavioral/Iterator/README.po b/locale/pt_BR/LC_MESSAGES/Behavioral/Iterator/README.po
index 7833fbf..25ccf3a 100644
--- a/locale/pt_BR/LC_MESSAGES/Behavioral/Iterator/README.po
+++ b/locale/pt_BR/LC_MESSAGES/Behavioral/Iterator/README.po
@@ -20,7 +20,7 @@ msgid "Purpose"
 msgstr ""
 
 #: ../../Behavioral/Iterator/README.rst:7
-msgid To make an object iterable and to make it appear like a collection of objects."
+msgid "To make an object iterable and to make it appear like a collection of objects."
 msgstr ""
 
 #: ../../Behavioral/Iterator/README.rst:11
diff --git a/locale/template/LC_MESSAGES/Creational/FactoryMethod/README.pot b/locale/template/LC_MESSAGES/Creational/FactoryMethod/README.pot
index 1a91a9f..2cf0eb8 100644
--- a/locale/template/LC_MESSAGES/Creational/FactoryMethod/README.pot
+++ b/locale/template/LC_MESSAGES/Creational/FactoryMethod/README.pot
@@ -29,7 +29,7 @@ msgstr ""
 #: ../../Creational/FactoryMethod/README.rst:12
 msgid ""
 "This pattern is a \"real\" Design Pattern because it achieves the "
-"Dependency Inversion Principle" a.k.a the "D" in S.O.L.I.D principles."
+"\"Dependency Inversion Principle\" a.k.a the \"D\" in S.O.L.I.D principles."
 msgstr ""
 
 #: ../../Creational/FactoryMethod/README.rst:15
diff --git a/locale/template/LC_MESSAGES/Creational/Pool/README.pot b/locale/template/LC_MESSAGES/Creational/Pool/README.pot
index d21d897..b8f06f2 100644
--- a/locale/template/LC_MESSAGES/Creational/Pool/README.pot
+++ b/locale/template/LC_MESSAGES/Creational/Pool/README.pot
@@ -19,7 +19,7 @@ msgstr ""
 #: ../../Creational/Pool/README.rst:7
 msgid ""
 "The **object pool pattern** is a software creational design pattern that "
-"uses a set of initialized objects kept ready to use – a "pool" – rather "
+"uses a set of initialized objects kept ready to use – a \"pool\" – rather "
 "than allocating and destroying them on demand. A client of the pool will "
 "request an object from the pool and perform operations on the returned "
 "object. When the client has finished, it returns the object, which is a "
diff --git a/locale/zh_CN/LC_MESSAGES/Behavioral/Iterator/README.po b/locale/zh_CN/LC_MESSAGES/Behavioral/Iterator/README.po
index 7833fbf..25ccf3a 100644
--- a/locale/zh_CN/LC_MESSAGES/Behavioral/Iterator/README.po
+++ b/locale/zh_CN/LC_MESSAGES/Behavioral/Iterator/README.po
@@ -20,7 +20,7 @@ msgid "Purpose"
 msgstr ""
 
 #: ../../Behavioral/Iterator/README.rst:7
-msgid To make an object iterable and to make it appear like a collection of objects."
+msgid "To make an object iterable and to make it appear like a collection of objects."
 msgstr ""
 
 #: ../../Behavioral/Iterator/README.rst:11