diff --git a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl b/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
deleted file mode 100644
index 537fead0d400a13603625b65eb3adad3541508be..0000000000000000000000000000000000000000
--- a/htdocs/modulebuilder/template/build/makepack-dolibarrmodule.pl
+++ /dev/null
@@ -1,388 +0,0 @@
-#!/usr/bin/perl
-#----------------------------------------------------------------------------
-# \file         build/makepack-dolibarrmodule.pl
-# \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \author       (c)2005-2006    Laurent Destailleur <eldy@users.sourceforge.net>
-#               (c)2016         Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
-#----------------------------------------------------------------------------
-
-use Cwd;
-
-
-@LISTETARGET=("TGZ");   # Possible packages
-%REQUIREMENTTARGET=(    # Tool requirement for each package
-"TGZ"=>"tar",
-"ZIP"=>"7z"
-);
-%ALTERNATEPATH=(
-);
-
-
-use vars qw/ $REVISION $VERSION /;
-$REVISION='1.20';
-$VERSION="1.0 (build $REVISION)";
-
-
-
-#------------------------------------------------------------------------------
-# MAIN
-#------------------------------------------------------------------------------
-($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1;
-$DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
-
-# Detect OS type
-# --------------
-if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
-elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
-elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
-if (! $OS) {
-    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
-	print "Can't continue.\n";
-	print "makepack-dolibarrmodule.pl aborted.\n";
-    sleep 2;
-	exit 1;
-}
-
-# Define buildroot
-# ----------------
-if ($OS =~ /linux/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
-}
-if ($OS =~ /macos/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
-}
-if ($OS =~ /windows/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
-    $PROGPATH=$ENV{"ProgramFiles"};
-}
-if (! $TEMP || ! -d $TEMP) {
-    print "Error: A temporary directory can not be find.\n";
-    print "Check that TEMP or TMP environment variable is set correctly.\n";
-	print "makepack-dolibarrmodule.pl aborted.\n";
-    sleep 2;
-    exit 2;
-} 
-$BUILDROOT="$TEMP/dolibarr-buildroot";
-
-
-my $copyalreadydone=0;
-my $batch=0;
-
-for (0..@ARGV-1) {
-	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
-	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
-    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
-    	$PREFIX=$1; 
-    	$FILENAMESNAPSHOT.="-".$PREFIX; 
-    }
-}
-$SOURCE="$DIR/..";
-$DESTI="$SOURCE/build";
-if ($ENV{"DESTIMODULES"}) { $DESTI = $ENV{"DESTIMODULES"}; }		# Force output dir if env DESTIMODULES is defined
-$NEWDESTI=$DESTI;
-
-
-print "Makepack for modules version $VERSION\n";
-print "Source directory: $SOURCE\n";
-print "Target directory: $NEWDESTI\n";
-
-# Autodetect version and module name
-$mod_dir = "../core/modules/";
-opendir(DIR, $mod_dir);
-@mod_files=grep { /^mod\w*\.class.php$/ } readdir(DIR);
-foreach $file (@mod_files) {
-	$PROJECTINPUT=lc $1 if $file =~ /^mod(\w*)\.class.php$/;
-	$file = $mod_dir . $file;
-	open FILE, $file or die $!;
-	@file_content = <FILE>;
-	close FILE;
-	foreach $line (@file_content) {
-		# Extracts version number
-		$PROJVERSION=$1 if $line =~ /(?<=version\s=\s')(\d+(\.\d+){1,2})/;
-	}
-}
-
-# Ask and set version $MAJOR, $MINOR and $BUILD
-if ($PROJVERSION eq '')
-{
-	print "Enter value for version: ";
-	$PROJVERSION=<STDIN>;
-}
-chomp($PROJVERSION);
-($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-if ($MINOR eq '')
-{
-    print "Enter value for minor version: ";
-    $MINOR=<STDIN>;
-    chomp($MINOR);
-}
-
-# Ask module
-if ($PROJECTINPUT eq '')
-{
-	print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
-	$PROJECTINPUT=<STDIN>;
-}
-chomp($PROJECTINPUT);
-print "Move to ".$DIR." directory.\n";
-chdir($DIR);
-
-
-my @PROJECTLIST=();
-if ($PROJECTINPUT eq "all")
-{
-    opendir(DIR, $DIR) || return;
-    local @rv = grep { /^makepack\-(.*)\.conf$/ } sort readdir(DIR);
-    closedir(DIR);
-    foreach my $xxx (0..@rv-1) {
-    	if ($rv[$xxx] =~ /^makepack\-(.*)\.conf$/)
-    	{ 
-    	   @PROJECTLIST[$xxx]=$1;
-    	}
-    }
-}
-else
-{
-	@PROJECTLIST=($PROJECTINPUT);
-}
-
-
-# Loop on each projects
-foreach my $PROJECT (@PROJECTLIST) {
-	
-	if (! -f "makepack-".$PROJECT.".conf")
-	{
-	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
-		print "\n";
-		print "For help on building a module package, see web page\n";
-		print 
-"http://wiki.dolibarr.org/cindex.php/Module_development#Create_a_package_to_distribute_and_install_your_module\n";
-		print "makepack-dolibarrmodule.pl aborted.\n";
-	    sleep 2;
-	    exit 2;
-	}
-	
-	$FILENAME="$PROJECT";
-	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	if (-d "/usr/src/redhat") {
-	    # redhat
-	    $RPMDIR="/usr/src/redhat";
-	}
-	if (-d "/usr/src/RPM") {
-	    # mandrake
-	    $RPMDIR="/usr/src/RPM";
-	}
-	
-	
-	# Choose package targets
-	#-----------------------
-	$target="ZIP";    # Dolibarr modules are this format
-	$CHOOSEDTARGET{uc($target)}=1;
-	
-	
-	# Test if requirement is ok
-	#--------------------------
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) {
-	        # Test    
-	        print "Test requirement for target $target: Search '$req'... ";
-	        $ret=`"$req" 2>&1`;
-	        $coderetour=$?; $coderetour2=$coderetour>>8;
-	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
-	            # Not found error, we try in PROGPATH
-	            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-	            $coderetour=$?; $coderetour2=$coderetour>>8;
-	            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
-	        }    
-	
-	        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
-	            # Not found error
-	            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-	            $CHOOSEDTARGET{$target}=-1;
-	            last;
-	        } else {
-	            # Pas erreur ou erreur autre que programme absent
-	            print " Found ".$REQUIREMENTTARGET{$target}."\n";
-	        }
-	    }
-	}
-	
-	print "\n";
-	
-	# Check if there is at least on target to build
-	#----------------------------------------------
-	$nboftargetok=0;
-	$nboftargetneedbuildroot=0;
-	$nboftargetneedcvs=0;
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    if ($CHOOSEDTARGET{$target} < 0) { next; }
-		if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
-		{
-			$nboftargetneedbuildroot++;
-		}
-		if ($target eq 'SNAPSHOT')
-		{
-			$nboftargetneedcvs++;
-		}
-		$nboftargetok++;
-	}
-	
-	if ($nboftargetok) {
-	
-	    # Update CVS if required
-	    #-----------------------
-	    if ($nboftargetneedcvs)
-		{
-	    	print "Go to directory $SOURCE\n";
-	   		$olddir=getcwd();
-	   		chdir("$SOURCE");
-	    	print "Run cvs update -P -d\n";
-	    	$ret=`cvs update -P -d 2>&1`;
-	    	chdir("$olddir");
-		}
-		
-	    # Update buildroot if required
-	    #-----------------------------
-	    if ($nboftargetneedbuildroot)
-		{
-		    if (! $copyalreadydone) {
-		    	print "Delete directory $BUILDROOT\n";
-		    	$ret=`rm -fr "$BUILDROOT"`;
-	
-		    	mkdir "$BUILDROOT";
-		    	mkdir "$BUILDROOT/$PROJECT";
-		    	
-				$result=open(IN,"<makepack-".$PROJECT.".conf");
-				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
-			    while(<IN>)
-			    {
-			    	if ($_ =~ /^#/) { next; }	# Do not process comments
-					
-					$_ =~ s/\n//;
-			    	$_ =~ /^(.*)\/[^\/]+/;
-			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
-			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
-			    	if ($_ !~ /version\-/)
-			    	{
-			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
-		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
-			    	}
-				}	
-				close IN;
-				
-				@timearray=localtime(time());
-				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
-#				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
-#		
-#				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
-#				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
-#				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
-#				print VF "Build  : ".$fulldate."\n";
-#				close VF;
-		    }
-		    print "Clean $BUILDROOT\n";
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
-		}    
-	    
-	    # Build package for each target
-	    #------------------------------
-	    foreach my $target (keys %CHOOSEDTARGET) {
-	        if ($CHOOSEDTARGET{$target} < 0) { next; }
-	    
-	        print "\nBuild package for target $target\n";
-	        
-	    	if ($target eq 'TGZ') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; } 
-
-	    		print "Remove target $FILENAMETGZ.tgz...\n";
-	    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
-	    		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
-	   		    $cmd="tar --exclude-vcs --exclude *.tgz --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
-	   		    $ret=`$cmd`;
-	            if ($OS =~ /windows/i) {
-	        		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-	            }
-	            else
-	            {
-	        		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-	            }
-	            next;
-	    	}
-	
-	    	if ($target eq 'ZIP') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
-				 
-	    		print "Remove target $FILENAMEZIP.zip...\n";
-	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
-	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
-	
-	            print "Go to directory $BUILDROOT\n";
-	     		$olddir=getcwd();
-	     		chdir("$BUILDROOT");
-	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
-				print $cmd."\n";
-				$ret= `$cmd`;
-	            chdir("$olddir");
-	
-	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
-	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-	    		next;
-	    	}
-	    
-	    	if ($target eq 'EXE') {
-	    		$NEWDESTI=$DESTI;
-				if (-d $DESTI.'/../modules') { $NEWDESTI=$DESTI.'/../modules'; }
-
-	    		print "Remove target $FILENAMEEXE.exe...\n";
-	    		unlink "$NEWDESTI/$FILENAMEEXE.exe";
-	    		print "Compress into $FILENAMEEXE.exe by $FILENAMEEXE.nsi...\n";
-	    		$command="\"$REQUIREMENTTARGET{$target}\" /DMUI_VERSION_DOT=$MAJOR.$MINOR.$BUILD /X\"SetCompressor bzip2\" \"$SOURCE\\build\\exe\\$FILENAME.nsi\"";
-	            print "$command\n";
-	    		$ret=`$command`;
-	    		print "Move $FILENAMEEXE.exe to $NEWDESTI\n";
-	    		rename("$SOURCE\\build\\exe\\$FILENAMEEXE.exe","$NEWDESTI/$FILENAMEEXE.exe");
-	    		next;
-	    	}
-	    
-	    }
-	
-	}
-	
-	print "\n----- Summary -----\n";
-	foreach my $target (keys %CHOOSEDTARGET) {
-	    if ($CHOOSEDTARGET{$target} < 0) {
-	        print "Package $target not built (bad requirement).\n";
-	    } else {
-	        print "Package $target built successfully in $NEWDESTI\n";
-	    }
-	}
-
-
-}
-
-
-if (! $batch) {
-    print "\nPress key to finish...";
-    my $WAITKEY=<STDIN>;
-}
-
-0;
diff --git a/htdocs/modulebuilder/template/build/makepack-mymodule.conf b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
index c7a47fbe45e457bfc1e843264e738e8e7a51ca05..16dc1e7b82b4e06a250b43fdb18d6c9f8b5ce742 100644
--- a/htdocs/modulebuilder/template/build/makepack-mymodule.conf
+++ b/htdocs/modulebuilder/template/build/makepack-mymodule.conf
@@ -8,19 +8,4 @@
 # Setup:   Go on Dolibarr setup - modules to enable module.
 #
 # Files in module
-index.php
-mypage.php
-admin/
-class/
-COPYING
-core/
-css/
-doc/
-img/
-js/
-langs/
-lib/
-scripts/
-sql/
-vendor/
-README.md
+mymodule/
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php b/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
deleted file mode 100644
index 45cf82f4b9cffea198de2596be6a60a5e1f3dc89..0000000000000000000000000000000000000000
--- a/htdocs/modulebuilder/template/class/ParsedownDolibarr.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * Copyright (C) 2016  Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    class/ParsedownDolibarr.php
- * \ingroup mymodule
- * \brief   Custom Parsedown class to display inline images from the README.md in the about page
- */
-
-/** Includes */
-require __DIR__ . '/../vendor/autoload.php';
-
-/**
- * Class ParsedownDolibarr
- */
-class ParsedownDolibarr extends Parsedown
-{
-    /**
-     * Resolve inline images relative URLs to the module's path
-     *
-     * @param $Excerpt
-     * @return array|void
-     */
-    protected function inlineImage($Excerpt)
-    {
-        $image = parent::inlineImage($Excerpt);
-        $path = new \Enrise\Uri($image['element']['attributes']['src']);
-        if ($path->isRelative()) {
-            $image['element']['attributes']['src'] = dol_buildpath('/mymodule/' . $path, 1);
-        }
-        return $image;
-    }
-}
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 1361a7b48978c2ae9c44f63f003436e2cbdec28b..7047332bbfce538f537863dab346a6796c5aa85d 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -55,8 +55,8 @@ class ActionsMyModule
 	 * Overloading the doActions function : replacing the parent's function with the one below
 	 *
 	 * @param   array()         $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    &$object        The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          &$action        Current action (if set). Generally create or edit or null
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
 	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
 	 */
diff --git a/htdocs/modulebuilder/template/js/myjs.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
similarity index 96%
rename from htdocs/modulebuilder/template/js/myjs.js.php
rename to htdocs/modulebuilder/template/js/mymodule.js.php
index b2649676f141554b8e423e0bb01c21b522d9c47f..ae8ce6cbe0d9c9d6df6483024c9796dbb8ae2008 100644
--- a/htdocs/modulebuilder/template/js/myjs.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    js/myjs.js.php
+ * \file    js/mymodule.js.php
  * \ingroup mymodule
  * \brief   Example JavaScript.
  *
diff --git a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
index 3a310e48f6632f9a07f3eff5c6db3826d3f99e1b..41dc9891af793894e61084b08be375db1ba4b1e7 100644
--- a/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
+++ b/htdocs/modulebuilder/template/test/functional/MyModuleFunctionalTest.php
@@ -39,7 +39,7 @@ use PHPUnit_Extensions_Selenium2TestCase_WebDriverException;
  * @todo Windows support (IE, Google Chrome, Mozilla Firefox, Safari)
  * @todo OSX support (Safari, Google Chrome, Mozilla Firefox)
  *
- * @package test\functional
+ * @package Testmymodule
  */
 class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 {
@@ -82,8 +82,8 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	/**
 	 * Helper function to select links by href
 	 *
-	 * @param $value
-	 * @return mixed
+	 * @param  string  $value      Href
+	 * @return mixed               Helper string    
 	 */
 	protected function byHref($value)
 	{
@@ -261,9 +261,7 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 		$this->authenticate();
 		return $this->assertContains(
 			'tick.png',
-			$this
-				->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')
-				->attribute('src'),
+			$this->byXPath('//td[text()="interface_99_modMyModule_MyTrigger.class.php"]/following::img')->attribute('src'),
 			"Trigger enabled"
 		);
 	}
diff --git a/htdocs/modulebuilder/template/test/unit/MyClassTest.php b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
index 16016baf117afe3fff80a5e6624eb0e203a3ed93..94898e9209bc56dc6d2957464289dcf93c43a97e 100644
--- a/htdocs/modulebuilder/template/test/unit/MyClassTest.php
+++ b/htdocs/modulebuilder/template/test/unit/MyClassTest.php
@@ -28,7 +28,7 @@ namespace test\unit;
 
 /**
  * Class MyClassTest
- * @package test\unit
+ * @package Testmymodule
  */
 class MyClassTest extends \PHPUnit_Framework_TestCase
 {
@@ -93,10 +93,10 @@ class MyClassTest extends \PHPUnit_Framework_TestCase
 	/**
 	 * Unsuccessful test
 	 *
-	 * @param \Exception $e
-	 * @throws \Exception
+	 * @param  Exception $e    Exception
+	 * @throws Exception
 	 */
-	protected function onNotSuccessfulTest(\Exception $e)
+	protected function onNotSuccessfulTest(Exception $e)
 	{
 		fwrite(STDOUT, __METHOD__ . "\n");
 		throw $e;