diff --git a/src/test/java/org/olat/course/All_Elements_Course_Without_External_Content.zip b/src/test/java/org/olat/course/All_Elements_Course_Without_External_Content.zip
new file mode 100644
index 0000000000000000000000000000000000000000..959269705ad49de29e0f43c94ddc078517da7147
Binary files /dev/null and b/src/test/java/org/olat/course/All_Elements_Course_Without_External_Content.zip differ
diff --git a/src/test/java/org/olat/util/FunctionalHtmlUtil.java b/src/test/java/org/olat/util/FunctionalHtmlUtil.java
index bcb5f1582860e7330382f398f557cdb7842b4375..02ce2408093b9b6cf78fde14c3a1c64c7577ba80 100644
--- a/src/test/java/org/olat/util/FunctionalHtmlUtil.java
+++ b/src/test/java/org/olat/util/FunctionalHtmlUtil.java
@@ -42,7 +42,7 @@ public class FunctionalHtmlUtil {
 			String currentText = html.substring(offset, nextOffset);
 			
 			if(!currentText.matches("^[\\s]+$")){
-				textBuffer.append(currentText);
+				textBuffer.append(currentText.trim());
 				
 				if(insertNewlines && !currentText.endsWith("\n")){
 					textBuffer.append('\n');
diff --git a/src/test/java/org/olat/util/FunctionalVOUtil.java b/src/test/java/org/olat/util/FunctionalVOUtil.java
index 4dd86d436c8310055ced87465f07c16b70070c1a..4688b79c4615ae4dad3f98087a24777ed0cbde41 100644
--- a/src/test/java/org/olat/util/FunctionalVOUtil.java
+++ b/src/test/java/org/olat/util/FunctionalVOUtil.java
@@ -198,7 +198,7 @@ public class FunctionalVOUtil {
 	 * Imports the "All Elements Course" via REST.
 	 */
 	public CourseVO importAllElementsCourse(URL deploymentUrl) throws URISyntaxException, IOException{
-		return(importCourse(deploymentUrl, "/org/olat/course/All_Elements_Course.zip", "All_Elements_Course.zip", "All Elements Course", "All Elements Course"));
+		return(importCourse(deploymentUrl, "/org/olat/course/All_Elements_Course_Without_External_Content.zip", "All_Elements_Course_Without_External_Content.zip", "All Elements Course Without External Content", "All Elements Course Without External Content"));
 	}
 
 	/**
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
index 0c057af6bf10d14f27f7d95864cac8ad4b8d004a..332bf55c3366fd320e1d1f81652d34fdd390a54a 100644
--- a/src/test/resources/arquillian.xml
+++ b/src/test/resources/arquillian.xml
@@ -12,7 +12,7 @@
         <configuration>
             <property name="workDir">target/arquillianDeployments</property>
 			<property name="catalinaHome">target/arq-apache-tomcat-7.0.27</property>
-			<property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m</property>
+			<property name="javaVmArguments">-XX:MaxPermSize=256m -Xmx2048m -Xms512m -Djava.awt.headless=true</property>
 			<!-- debugging arguments for javaVm: -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y -->
         </configuration>
     </container>