diff --git a/xdoc/src/plugin-test/maven.xml b/xdoc/src/plugin-test/maven.xml
index 40934bab..a64563dc 100644
--- a/xdoc/src/plugin-test/maven.xml
+++ b/xdoc/src/plugin-test/maven.xml
@@ -17,11 +17,13 @@
  -->
 <project xmlns:util="jelly:util" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:ant="jelly:ant">
   <goal name="testPlugin">
-    <maven:set plugin="maven-multiproject-plugin" property="goal" value="testPlugin"/>
-    <attainGoal name="multiproject:site"/>
+    <!--<maven:set plugin="maven-multiproject-plugin" property="goal" value="testPlugin"/>-->
+    <j:set var="goal" value="testPlugin"/>
+    <attainGoal name="multiproject:goal"/>
   </goal>
   <goal name="multixdoc">
-    <maven:set plugin="maven-multiproject-plugin" property="goal" value="xdoc"/>
-    <attainGoal name="multiproject:site"/>
+    <!--<maven:set plugin="maven-multiproject-plugin" property="goal" value="xdoc"/>-->
+    <j:set var="goal" value="xdoc"/>
+    <attainGoal name="multiproject:goal"/>
   </goal>
 </project>
diff --git a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
index f3fbe029..4e3be1a7 100644
--- a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
+++ b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
@@ -19,7 +19,7 @@
 
 <!-- $Id$ -->
 <!DOCTYPE document [
-	<!ENTITY % common-links SYSTEM "common/links.xml">
+	<!ENTITY % common-links SYSTEM "../common/links.xml">
 	%common-links;
 ]>
 <document>
diff --git a/xdoc/src/plugin-test/test02/maven.xml b/xdoc/src/plugin-test/test02/maven.xml
index b375724a..bb88b157 100644
--- a/xdoc/src/plugin-test/test02/maven.xml
+++ b/xdoc/src/plugin-test/test02/maven.xml
@@ -16,7 +16,8 @@
  */
  -->
 <project xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:doc="doc" xmlns:x="jelly:xml">
-  <goal name="testPlugin" prereqs="clean,xdoc">
+  <goal name="testPlugin" prereqs="clean,maven-linkcheck-plugin:report,xdoc">
+    <!-- Shouldn't this be done in the linkcheck plugin? -->
     <j:set var="linkcheck" value="${maven.build.dir}/linkcheck/linkcheck-results.xml"/>
     <assert:assertFileExists file="${linkcheck}"/>
     <util:file var="linkcheckFile" name="${linkcheck}"/>
diff --git a/xdoc/src/plugin-test/test03/maven.xml b/xdoc/src/plugin-test/test03/maven.xml
deleted file mode 100644
index d32b1155..00000000
--- a/xdoc/src/plugin-test/test03/maven.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<project xmlns:util="jelly:util" 
-  xmlns:j="jelly:core" 
-  xmlns:assert="assert" 
-  xmlns:doc="doc" 
-  xmlns:x="jelly:xml">
-
-  <goal name="testPlugin" prereqs="clean,xdoc">
-    <j:set var="linkcheck" value="${maven.build.dir}/linkcheck/linkcheck-results.xml"/>
-    <assert:assertFileExists file="${linkcheck}"/>
-    <util:file var="linkcheckFile" name="${linkcheck}"/>
-    <x:parse var="linkcheckDoc" xml="${linkcheckFile.toURL()}"/>
-    <x:set var="countLogo" select="count($linkcheckDoc/linkcheck/file/result[contains(child::target,'apache-maven-project.png')][contains(child::status,'NOT FOUND')])"/>
-    <assert:assertEquals expected="0" value="${countLogo.intValue().toString()}" msg="Logo not found."/>
-    <x:set var="countUrl" select="count($linkcheckDoc/linkcheck/file/result[contains(child::target,'project-info.html')][contains(child::status,'NOT FOUND')])"/>
-    <assert:assertEquals expected="0" value="${countUrl.intValue().toString()}" msg="Url not found."/>
-    <assert:assertFileExists file="velocity.log"/> 
-    
-    <!-- Test the output according the project.properties file -->
-    <!-- maven.xdoc.locale.supported=en_CA, fr_CA -->
-    <!-- Test Default language -->
-    <assert:assertFileExists file="${maven.docs.dest}/cvs-usage.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/mail-lists.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/dependencies.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/maven-reports.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/team-list.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/downloads.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/index.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/myfile_i18n.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/issue-tracking.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/project-info.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/subdir/testjsltosite.html"/>
-    <!-- Test en_CA language -->    
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/cvs-usage.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/mail-lists.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/dependencies.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/maven-reports.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/team-list.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/downloads.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/index.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/myfile_i18n.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/issue-tracking.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/project-info.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/subdir/testjsltosite.html"/>
-    
-    <!-- Test fr_CA language -->    
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/cvs-usage.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/mail-lists.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/dependencies.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/maven-reports.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/team-list.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/downloads.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/index.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/myfile_i18n.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/issue-tracking.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/project-info.html"/>
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/subdir/testjsltosite.html"/>
-  </goal>
-  
-</project>
diff --git a/xdoc/src/plugin-test/test03/project.properties b/xdoc/src/plugin-test/test03/project.properties
deleted file mode 100644
index 601859a6..00000000
--- a/xdoc/src/plugin-test/test03/project.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-#  
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -------------------------------------------------------------------
-
-maven.xdoc.locale.default=en
-maven.xdoc.locale.supported=en_CA, fr_CA
-
-# Presentation Properties
-maven.xdoc.date=left
-maven.xdoc.date.format=dd MMMM yyyy HH:mm z
-maven.xdoc.date.locale=en
diff --git a/xdoc/src/plugin-test/test03/project.xml b/xdoc/src/plugin-test/test03/project.xml
deleted file mode 100644
index 5921a885..00000000
--- a/xdoc/src/plugin-test/test03/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<project>
-  <pomVersion>3</pomVersion>
-  <issueTrackingUrl>http://jira.codehaus.org/browse/MAVEN</issueTrackingUrl>
-  <id>test-maven-xdoc-plugin-03</id>
-  <name>MPXDOC-128</name>
-  <groupId>maven</groupId>
-  <currentVersion>1.0</currentVersion>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>/project-info.html</url>
-    <logo>/images/apache-maven-project.png</logo>
-  </organization>
-  <logo>/images/maven.gif</logo>
-  <description>Test for MPXDOC-128</description>
-  <shortDescription>Test for MPXDOC-128</shortDescription>
-  <url>/project-info.html</url>
-</project>
-
diff --git a/xdoc/src/plugin-test/test03/xdocs/images/apache-maven-project.png b/xdoc/src/plugin-test/test03/xdocs/images/apache-maven-project.png
deleted file mode 100644
index 81f80d81..00000000
Binary files a/xdoc/src/plugin-test/test03/xdocs/images/apache-maven-project.png and /dev/null differ
diff --git a/xdoc/src/plugin-test/test03/xdocs/images/maven.gif b/xdoc/src/plugin-test/test03/xdocs/images/maven.gif
deleted file mode 100644
index 0b92a2d1..00000000
Binary files a/xdoc/src/plugin-test/test03/xdocs/images/maven.gif and /dev/null differ
diff --git a/xdoc/src/plugin-test/test03/xdocs/myfile_i18n.xml b/xdoc/src/plugin-test/test03/xdocs/myfile_i18n.xml
deleted file mode 100644
index ae658e21..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/myfile_i18n.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<document>
-    <properties>
-        <author email="vincent.siveton@gmail.com">Vincent Siveton</author>
-        <title key="myfile_i18n.title"/>
-    </properties>
-
-    <body>
-        <section key="myfile_i18n.section1.title">
-            <p>
-                <message key="myfile_i18n.section1.description1"/>
-            </p>
-            <p>
-                <message key="myfile_i18n.section1.description2"/>
-            </p>
-        </section>
-    </body>
-</document>
\ No newline at end of file
diff --git a/xdoc/src/plugin-test/test03/xdocs/navigation-pdf.xml b/xdoc/src/plugin-test/test03/xdocs/navigation-pdf.xml
deleted file mode 100644
index 49b5f7da..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/navigation-pdf.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<project name="Nanuq"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="MAVEN_HOME/maven-navigation-1.0.xsd">
-
-    <title>MPXDOC128</title>
-    
-    <body>
-        <menu name="General Project Information">
-            <item name="myfile_i18n"
-                href="/myfile_i18n.html" />
-            <item name="testjsltosite" 
-                href="/subdir/testjsltosite.html" />
-            <item name="testjsltosite2" 
-                href="/subdir/subdir2/testjsltosite2.html" />
-        </menu>
-    </body>
-</project>
diff --git a/xdoc/src/plugin-test/test03/xdocs/navigation.xml b/xdoc/src/plugin-test/test03/xdocs/navigation.xml
deleted file mode 100644
index 3977445c..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/navigation.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<project name="MPXDOC-128">
-  <title key="navigation.title"/>
-  <body>
-    <breadcrumbs>
-      <item name="Maven" href="http://maven.apache.org"/>
-      <item name="Maven Plugins" href="http://maven.apache.org/maven-1.x/plugins/index.html"/>
-    </breadcrumbs>
-    <links>
-      <!--
-            <item name="PDF Documentation" href="app.pdf"
-                img="images/pdf.gif"/>
--->
-    </links>
-    <!-- project overview -->
-    <menu key="navigation.menu1.title">
-      <item key="navigation.menu1.item1" href="/myfile_i18n.html"/>
-      <item key="navigation.menu1.item2" href="/subdir/testjsltosite.html"/>
-      <item key="navigation.menu1.item3" href="/subdir/subdir2/testjsltosite2.html"/>
-    </menu>
-  </body>
-</project>
diff --git a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite.xml b/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite.xml
deleted file mode 100644
index 4a5dc2d2..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<document>
-    <properties>
-        <author email="vincent.siveton@gmail.com">Vincent Siveton</author>
-        <title key="testjstltosite.title"/>
-    </properties>
-
-    <body>
-        <section key="testjstltosite.section1.title">
-            <p>
-                <message key="testjstltosite.section1.description1"/>
-            </p>
-    	    <p>
-                <message key="testjstltosite.section1.description2"/>
-    	    </p>
-        </section>
-    </body>
-</document>
\ No newline at end of file
diff --git a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite2.xml b/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite2.xml
deleted file mode 100644
index 4a5dc2d2..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite2.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<document>
-    <properties>
-        <author email="vincent.siveton@gmail.com">Vincent Siveton</author>
-        <title key="testjstltosite.title"/>
-    </properties>
-
-    <body>
-        <section key="testjstltosite.section1.title">
-            <p>
-                <message key="testjstltosite.section1.description1"/>
-            </p>
-    	    <p>
-                <message key="testjstltosite.section1.description2"/>
-    	    </p>
-        </section>
-    </body>
-</document>
\ No newline at end of file
diff --git a/xdoc/src/plugin-test/test03/xdocs/subdir/testjsltosite.xml b/xdoc/src/plugin-test/test03/xdocs/subdir/testjsltosite.xml
deleted file mode 100644
index 25dbee7c..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/subdir/testjsltosite.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<document>
-    <properties>
-        <author email="vincent.siveton@gmail.com">Vincent Siveton</author>
-        <title key="testjstltosite.title"/>
-    </properties>
-
-    <body>
-        <section key="testjstltosite.section1.title">
-            <subsection key="testjstltosite.section1.title">
-                <p>
-                    <message key="testjstltosite.section1.description1"/>
-                </p>
-                <p>
-                    <message key="testjstltosite.section1.description2"/>
-                </p>
-            </subsection>
-        </section>
-    </body>
-</document>
\ No newline at end of file
diff --git a/xdoc/src/plugin-test/test03/xdocs/xdocs.properties b/xdoc/src/plugin-test/test03/xdocs/xdocs.properties
deleted file mode 100644
index 62d52eb3..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/xdocs.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# From navigation.xml
-navigation.title=MPXDOC-128
-navigation.menu1.title=General Project Information
-navigation.menu1.item1=myfile_i18n
-navigation.menu1.item2=testjsltosite
-navigation.menu1.item3=testjsltosite2
-
-# From myfile_i18n.xml
-myfile_i18n.title=Xdoc test Document
-myfile_i18n.section1.title=Title 1
-myfile_i18n.section1.description1=empty document
-myfile_i18n.section1.description2=This document is generated separately from other xdoc documents but should retain the site stylesheet and navigation.
-
-# From testjstltosite.xml
-testjstltosite.title=test jslToSite tag
-testjstltosite.section1.title=Title 1
-testjstltosite.section1.description1=empty document
-testjstltosite.section1.description2=This document is generated separately from other xdoc documents but should retain the site stylesheet and navigation.
-
-testlinks.mysite1=http://mysite1.com
-testlinks.mysite2=http://mysite2.com
diff --git a/xdoc/src/plugin-test/test03/xdocs/xdocs_fr.properties b/xdoc/src/plugin-test/test03/xdocs/xdocs_fr.properties
deleted file mode 100644
index 2b784963..00000000
--- a/xdoc/src/plugin-test/test03/xdocs/xdocs_fr.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# From navigation.xml
-navigation.title=MPXDOC-128
-navigation.menu1.title=Information générale sur le projet
-navigation.menu1.item1=myfile_i18n
-navigation.menu1.item2=testjsltosite
-navigation.menu1.item3=testjsltosite2
-
-# From myfile_i18n.xml
-myfile_i18n.title=Document Xdoc test
-myfile_i18n.section1.title=Titre 1
-myfile_i18n.section1.description1=document vide
-myfile_i18n.section1.description2=Ce document est produit séparément des autres documents XDOC mais devrait maintenir le stylesheet et la navigation d'emplacement.
-
-# From testjstltosite.xml
-testjstltosite.title=test jslToSite tag
-testjstltosite.section1.title=Titre 1
-testjstltosite.section1.description1=document vide
-testjstltosite.section1.description2=Ce document est produit séparément des autres documents XDOC mais devrait maintenir le stylesheet et la navigation d'emplacement.
-
-testlinks.mysite1=http://mysite1.fr
-testlinks.mysite2=http://mysite2.fr
diff --git a/xdoc/src/plugin-test/test04/maven.xml b/xdoc/src/plugin-test/test04/maven.xml
index 4d48b104..981a3dc1 100644
--- a/xdoc/src/plugin-test/test04/maven.xml
+++ b/xdoc/src/plugin-test/test04/maven.xml
@@ -22,20 +22,12 @@
   xmlns:x="jelly:xml">
 
   <goal name="testPlugin" prereqs="clean,xdoc">
-    <j:set var="linkcheck" value="${maven.build.dir}/linkcheck/linkcheck-results.xml"/>
-    <assert:assertFileExists file="${linkcheck}"/>
-    <util:file var="linkcheckFile" name="${linkcheck}"/>
-    <x:parse var="linkcheckDoc" xml="${linkcheckFile.toURL()}"/>
-    <x:set var="countLogo" select="count($linkcheckDoc/linkcheck/file/result[contains(child::target,'apache-maven-project.png')][contains(child::status,'NOT FOUND')])"/>
-    <assert:assertEquals expected="0" value="${countLogo.intValue().toString()}" msg="Logo not found."/>
-    <x:set var="countUrl" select="count($linkcheckDoc/linkcheck/file/result[contains(child::target,'project-info.html')][contains(child::status,'NOT FOUND')])"/>
-    <assert:assertEquals expected="0" value="${countUrl.intValue().toString()}" msg="Url not found."/>
-    <assert:assertFileExists file="velocity.log"/> 
     
     <!-- Test the output according the project.properties file -->
-    <!-- maven.xdoc.locale.list=en_CA, fr_CA -->
+    <!-- maven.xdoc.locale.supported=en_CA, fr_CA, de_DE -->
+    
     <!-- Test Default language -->
-    <assert:assertFileExists file="${maven.docs.dest}/cvs-usage.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/scm-usage.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/mail-lists.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/dependencies.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/maven-reports.html"/>
@@ -46,8 +38,9 @@
     <assert:assertFileExists file="${maven.docs.dest}/issue-tracking.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/project-info.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/subdir/testjsltosite.html"/>
+    
     <!-- Test en_CA language -->    
-    <assert:assertFileExists file="${maven.docs.dest}/en_CA/cvs-usage.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/en_CA/scm-usage.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/en_CA/mail-lists.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/en_CA/dependencies.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/en_CA/maven-reports.html"/>
@@ -60,7 +53,7 @@
     <assert:assertFileExists file="${maven.docs.dest}/en_CA/subdir/testjsltosite.html"/>
     
     <!-- Test fr_CA language -->    
-    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/cvs-usage.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/fr_CA/scm-usage.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/fr_CA/mail-lists.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/fr_CA/dependencies.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/fr_CA/maven-reports.html"/>
@@ -71,6 +64,20 @@
     <assert:assertFileExists file="${maven.docs.dest}/fr_CA/issue-tracking.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/fr_CA/project-info.html"/>
     <assert:assertFileExists file="${maven.docs.dest}/fr_CA/subdir/testjsltosite.html"/>
+
+    <!-- Test de_DE language -->    
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/scm-usage.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/mail-lists.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/dependencies.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/maven-reports.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/team-list.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/downloads.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/index.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/myfile_i18n.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/issue-tracking.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/project-info.html"/>
+    <assert:assertFileExists file="${maven.docs.dest}/de_DE/subdir/testjsltosite.html"/>
+
   </goal>
   
 </project>
diff --git a/xdoc/src/plugin-test/testDependenciesComment/maven.xml b/xdoc/src/plugin-test/testDependenciesComment/maven.xml
index 000174df..901d3a70 100644
--- a/xdoc/src/plugin-test/testDependenciesComment/maven.xml
+++ b/xdoc/src/plugin-test/testDependenciesComment/maven.xml
@@ -22,14 +22,18 @@
     <assert:assertFileExists file="${depXmlPath}"/>
     <util:file var="depXmlFile" name="${depXmlPath}"/>
     <x:parse var="depXmlDom" xml="${depXmlFile}"/>
-    <x:set var="headerComment" select="string($depXmlDom/document/body/section[@name='Dependencies']/table/thead/tr/th[5])"/>
+    <!-- This has been internationalized...
+    <x:set var="headerComment" select="string($depXmlDom/document/body/section[@name='Dependencies']/table/thead/tr/th[6])"/>
     <assert:assertEquals expected="Comment" value="${headerComment}"/>
+    -->
     <x:forEach var="tr" select="$depXmlDom/document/body/section[@name='Dependencies']/table/tbody/*">
       <x:set var="depName" select="string($tr/td[1])"/>
-      <x:set var="comment" select="string($tr/td[5])"/>
+      <x:set var="scope" select="string($tr/td[4])"/>
+      <x:set var="comment" select="string($tr/td[6])"/>
       <j:if test="${depName=='dom4j'}">
         <echo>Checking comment for dependency dom4j</echo>
         <assert:assertEquals expected="Simple comment" value="${comment.trim()}"/>
+        <assert:assertEquals expected="test" value="${scope.trim()}"/>
       </j:if>
       <j:if test="${depName=='commons-jelly'}">
         <echo>Checking comment for dependency commons-jelly</echo>
diff --git a/xdoc/src/plugin-test/testDependenciesComment/project.xml b/xdoc/src/plugin-test/testDependenciesComment/project.xml
index b414f482..788adf32 100644
--- a/xdoc/src/plugin-test/testDependenciesComment/project.xml
+++ b/xdoc/src/plugin-test/testDependenciesComment/project.xml
@@ -33,6 +33,7 @@
       <version>1.4-dev-8</version>
       <properties>
         <comment>Simple comment</comment>
+        <scope>test</scope>
       </properties>
     </dependency>