diff --git a/exercises/allergies/allergies_test.php b/exercises/allergies/allergies_test.php
index 81ef4266..8d0ed4b4 100644
--- a/exercises/allergies/allergies_test.php
+++ b/exercises/allergies/allergies_test.php
@@ -7,6 +7,8 @@ class AllergiesTest extends PHPUnit\Framework\TestCase
 
     /**
      * @dataProvider provideListOfAllergen
+     *
+     * @param Allergen $allergen
      */
     public function testNoAllergiesMeansNotAllergicToAnything($allergen)
     {
@@ -17,6 +19,8 @@ public function testNoAllergiesMeansNotAllergicToAnything($allergen)
 
     /**
      * @dataProvider provideListOfAllergen
+     *
+     * @param Allergen $allergicTo
      */
     public function testAllergiesToOneAllergen($allergicTo)
     {
@@ -26,9 +30,9 @@ public function testAllergiesToOneAllergen($allergicTo)
         $otherAllergen = array_filter(Allergen::allergenList(), function ($allergen) use ($allergicTo) {
             return $allergen != $allergicTo;
         });
-        $self = $this;
-        array_map(function ($allergen) use ($allergies, $self) {
-            $self->assertFalse($allergies->isAllergicTo($allergen));
+
+        array_map(function ($allergen) use ($allergies) {
+            $this->assertFalse($allergies->isAllergicTo($allergen));
         }, $otherAllergen);
     }
 
diff --git a/exercises/grade-school/grade-school_test.php b/exercises/grade-school/grade-school_test.php
index fa44cc82..3fbdbadd 100644
--- a/exercises/grade-school/grade-school_test.php
+++ b/exercises/grade-school/grade-school_test.php
@@ -18,7 +18,7 @@ public function testAddStudent()
         $this->assertContains('Claire', $this->school->grade(2));
     }
 
-    public function testAddStudentsinSameGrade()
+    public function testAddStudentsInSameGrade()
     {
         $this->school->add("Marc", 2);
         $this->school->add("Virginie", 2);