diff --git a/convertExpectedException.php b/convertExpectedException.php
index 63306ec..6535f47 100644
--- a/convertExpectedException.php
+++ b/convertExpectedException.php
@@ -16,22 +16,24 @@ function processFile($filename) {
       $message_tags = $doc_block->getTagsByName('expectedExceptionMessage');
       if ($message_tags) {
         $message = $message_tags[0]->getDescription();
+        $message = preg_replace("/'/", "\\'", $message);
         //echo "$message\n\n";
       }
       else {
         $message = '';
       }
+      // Search method class - skip whitespaces and open brackets find the
+      // first line of code.
+      $method_class = $node->parent(Filter::isInstanceOf('Pharborist\Objects\ClassMethodNode'));
       // Prepare new statement. ( code - newlines - indent ).
+      $indentation = str_repeat(" ", $method_class->getColumnNumber() +  1);
       if ($message) {
-        $statement = "\$this->setExpectedException('" . $exception_class . "','"  . $message . "');" . PHP_EOL . PHP_EOL.  '    ';
+        $statement = "\$this->setExpectedException('" . $exception_class . "', '"  . $message . "');" . PHP_EOL . PHP_EOL. $indentation;
       }
       else {
-        $statement = "\$this->setExpectedException('$exception_class');" . PHP_EOL . PHP_EOL . '    ';
+        $statement = "\$this->setExpectedException('$exception_class');" . PHP_EOL . PHP_EOL . $indentation;
       }
       $new_nodes = Parser::parseSource($statement);
-      // Search method class - skip whitespaces and open brackets find the
-      // first line of code.
-      $method_class = $node->parent(Filter::isInstanceOf('Pharborist\Objects\ClassMethodNode'));
       // The next two lines of code are crappy -  it will not scale with large
       // method classes.
       $lines_of_code = $method_class->find(
@@ -42,21 +44,57 @@ function processFile($filename) {
       );
       $first_line_of_code = $lines_of_code->first();
       $new_nodes->insertBefore($first_line_of_code);
+      /** @var Pharborist\DocCommentNode $doc_comment */
+      $doc_comment = $method_class->getDocComment();
+      $text = $doc_comment->getText();
+      $text = preg_replace('/\n\s*\* \@expectedException.+?\n/', "\n", $text);
+      $text = preg_replace('/\n\s*\* \@expectedExceptionMessage.+?\n/', "\n", $text);
+      $text = preg_replace('/\n\s*\*\s*\n(\s*\*\/)/', "\n$1", $text);
+      $doc_comment->setText($text);
+      $method_class->setDocComment($doc_comment);
       file_put_contents($filename, $tree);
     }
   }
 }
 //processFile('./test.php');
+
+function recursive($dir)
+{
+  global $directories;
+
+  $odir = opendir($dir);
+
+  while (($file = readdir($odir)) !== FALSE)
+  {
+    if ($file != '.' && $file != '..' && is_dir($dir.DIRECTORY_SEPARATOR.$file))
+    {
+      if($file == "Tests" || $file == "tests"){
+        $directories[] = $dir.DIRECTORY_SEPARATOR.$file;
+      }
+      else {
+        recursive($dir.DIRECTORY_SEPARATOR.$file);
+      }
+    }
+  }
+  closedir($odir);
+}
+
 // This exposed a flaw in pharborist.
 // Unless Drupal core is patched with  DO-NOT_COMMIT-2822837-7.patch the classes
 // in core/modules/system/src/Tests/Installer will cause errors.
 // The following code will iterate over every class in D8 core
 // - please /Users/martin/sites/drupal/core to point to the core directory for your system.
-$directory = new \RecursiveDirectoryIterator('/Users/martin/sites/drupal/core');
-$iterator = new \RecursiveIteratorIterator($directory);
-$pattern = '/^.+Test\.php$/i';
-$regex = new \RegexIterator($iterator, $pattern, \RecursiveRegexIterator::GET_MATCH);
-foreach ($regex as $name => $object) {
-  echo "processing: $name\n";
-  processFile($name);
+$dir = '/path/to/drupal.site/core';
+$directory = new \RecursiveDirectoryIterator($dir);
+$directories = [];
+recursive($dir);
+foreach($directories as $dir){
+  $directory = new \RecursiveDirectoryIterator($dir);
+  $iterator = new \RecursiveIteratorIterator($directory);
+  $pattern = '/^.+Test\.php$/i';
+  $regex = new \RegexIterator($iterator, $pattern, \RecursiveRegexIterator::GET_MATCH);
+  foreach ($regex as $name => $object) {
+    echo "processing: $name<br>\n";
+    processFile($name);
+  }
 }