diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Id/AssignedIdGeneratorTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Id/AssignedIdGeneratorTest.php
index 8bdfee98f..8150efc70 100644
--- a/tests/Doctrine/Tests/ODM/PHPCR/Id/AssignedIdGeneratorTest.php
+++ b/tests/Doctrine/Tests/ODM/PHPCR/Id/AssignedIdGeneratorTest.php
@@ -16,7 +16,7 @@ public function testGenerate()
         $cm = new ClassMetadataProxy($id);
         $dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')->disableOriginalConstructor()->getMock();
 
-        $this->assertEquals($id, $generator->generate(null, $cm,  $dm));
+        $this->assertEquals($id, $generator->generate(null, $cm, $dm));
     }
 
     /**
@@ -31,7 +31,7 @@ public function testGenerateNoIdException()
         $dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')->disableOriginalConstructor()->getMock();
 
         try {
-            $generator->generate(null, $cm,  $dm);
+            $generator->generate(null, $cm, $dm);
         } catch (\Exception $expected) {
             return;
         }
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Id/ParentIdGeneratorTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Id/ParentIdGeneratorTest.php
index 3b06facbc..85dfe9830 100644
--- a/tests/Doctrine/Tests/ODM/PHPCR/Id/ParentIdGeneratorTest.php
+++ b/tests/Doctrine/Tests/ODM/PHPCR/Id/ParentIdGeneratorTest.php
@@ -30,7 +30,7 @@ public function testGenerate()
             ->method('getUnitOfWork')
             ->will($this->returnValue($uow))
         ;
-        $this->assertEquals('/miau/name', $generator->generate(null, $cm,  $dm));
+        $this->assertEquals('/miau/name', $generator->generate(null, $cm, $dm));
     }
 
     /**
@@ -44,7 +44,7 @@ public function testGenerateNoParent()
         $cm = new ParentClassMetadataProxy(null, 'name', $id);
         $dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')->disableOriginalConstructor()->getMock();
 
-        $this->assertEquals($id, $generator->generate(null, $cm,  $dm));
+        $this->assertEquals($id, $generator->generate(null, $cm, $dm));
     }
 
     /**
@@ -58,7 +58,7 @@ public function testGenerateNoName()
         $cm = new ParentClassMetadataProxy(new ParentDummy, '', $id);
         $dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')->disableOriginalConstructor()->getMock();
 
-        $this->assertEquals($id, $generator->generate(null, $cm,  $dm));
+        $this->assertEquals($id, $generator->generate(null, $cm, $dm));
     }
 
     /**
@@ -70,7 +70,7 @@ public function testGenerateNoIdNoParentNoName()
         $cm = new ParentClassMetadataProxy(null, '', '');
         $dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')->disableOriginalConstructor()->getMock();
 
-        $generator->generate(null, $cm,  $dm);
+        $generator->generate(null, $cm, $dm);
     }
 
     /**
@@ -82,7 +82,7 @@ public function testGenerateNoIdNoParent()
         $cm = new ParentClassMetadataProxy(null, 'name', '');
         $dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')->disableOriginalConstructor()->getMock();
 
-        $generator->generate(null, $cm,  $dm);
+        $generator->generate(null, $cm, $dm);
     }
 
     /**
@@ -94,7 +94,7 @@ public function testGenerateNoIdNoName()
         $cm = new ParentClassMetadataProxy(new ParentDummy, '', '');
         $dm = $this->getMockBuilder('Doctrine\ODM\PHPCR\DocumentManager')->disableOriginalConstructor()->getMock();
 
-        $generator->generate(null, $cm,  $dm);
+        $generator->generate(null, $cm, $dm);
     }
     /**
      * @expectedException \Doctrine\ODM\PHPCR\Id\IdException
@@ -117,7 +117,7 @@ public function testGenerateNoParentId()
             ->method('getUnitOfWork')
             ->will($this->returnValue($uow))
         ;
-        $generator->generate(null, $cm,  $dm);
+        $generator->generate(null, $cm, $dm);
     }
 }
 
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Id/RepositoryIdGeneratorTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Id/RepositoryIdGeneratorTest.php
index fade0d2ac..d67bae1b1 100644
--- a/tests/Doctrine/Tests/ODM/PHPCR/Id/RepositoryIdGeneratorTest.php
+++ b/tests/Doctrine/Tests/ODM/PHPCR/Id/RepositoryIdGeneratorTest.php
@@ -28,7 +28,7 @@ public function testGenerate()
 
         $generator = new RepositoryIdGenerator;
 
-        $this->assertEquals('generatedid', $generator->generate(null, $cm,  $dm));
+        $this->assertEquals('generatedid', $generator->generate(null, $cm, $dm));
     }
 
     /**
@@ -55,7 +55,7 @@ public function testGenerateNoIdException()
 
 
         try {
-            $generator->generate(null, $cm,  $dm);
+            $generator->generate(null, $cm, $dm);
         } catch (\Exception $expected) {
             return;
         }
diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractNodeTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractNodeTest.php
index d7fd4ec8c..60ff68598 100644
--- a/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractNodeTest.php
+++ b/tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/AbstractNodeTest.php
@@ -62,7 +62,7 @@ public function provideAddChildValidation()
                 array(
                 ),
             ),
-            // 1a. 
+            // 1a.
             // INVALID: Out of bounds
             array(
                 array(