diff --git a/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java b/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java
index 32dffba547b8d05971b7e6c7c99a9c328b4ff614..5baaa29cb2941639ba1b9843ce7a3e2633672ec6 100644
--- a/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java
+++ b/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java
@@ -119,6 +119,7 @@ public class GroupTaskConfigurationPage {
 		
 		By inputBy = By.cssSelector(".o_fileinput input[type='file']");
 		OOGraphene.uploadFile(inputBy, file, browser);
+		OOGraphene.waitBusy(browser);
 		
 		//save
 		By saveBy = By.cssSelector(".o_sel_course_gta_upload_task_form button.btn-primary");
@@ -129,7 +130,9 @@ public class GroupTaskConfigurationPage {
 	
 	public GroupTaskConfigurationPage saveTasks() {
 		By saveBy = By.cssSelector(".o_sel_course_gta_task_config_buttons button.btn-primary");
-		browser.findElement(saveBy).click();
+		List<WebElement> saveEls = browser.findElements(saveBy);
+		Assert.assertEquals(1, saveEls.size());
+		saveEls.get(0).click();
 		OOGraphene.waitBusy(browser);
 		return this;
 	}
@@ -144,10 +147,13 @@ public class GroupTaskConfigurationPage {
 		
 		By inputBy = By.cssSelector(".o_fileinput input[type='file']");
 		OOGraphene.uploadFile(inputBy, file, browser);
+		OOGraphene.waitBusy(browser);
 		
 		//save
 		By saveBy = By.cssSelector(".o_sel_course_gta_upload_solution_form button.btn-primary");
-		browser.findElement(saveBy).click();
+		List<WebElement> saveEls = browser.findElements(saveBy);
+		Assert.assertEquals(1, saveEls.size());
+		saveEls.get(0).click();
 		OOGraphene.waitBusy(browser);
 		return this;
 	}
diff --git a/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java b/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java
index bb99b87498add0364164d95d5272444fca14a9cb..6b0547cbcab59572f0669543a45826e27da66a75 100644
--- a/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java
+++ b/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java
@@ -57,7 +57,7 @@ public class GroupTaskPage {
 	}
 	
 	public GroupTaskPage assertTask(String taskName) {
-		By selectLinkBy = By.xpath("//div[@id='o_step_assignement_content']//h5[contains(text(),'" + taskName + "')]");
+		By selectLinkBy = By.xpath("//div[@id='o_step_assignement_content']//h5//span[contains(text(),'" + taskName + "')]");
 		List<WebElement> selectLinkEls = browser.findElements(selectLinkBy);
 		Assert.assertFalse(selectLinkEls.isEmpty());
 		return this;
@@ -94,6 +94,7 @@ public class GroupTaskPage {
 		
 		By inputBy = By.cssSelector(".o_fileinput input[type='file']");
 		OOGraphene.uploadFile(inputBy, file, browser);
+		OOGraphene.waitBusy(browser);
 		
 		By saveButtonBy = By.cssSelector(".o_sel_course_gta_upload_form button.btn-primary");
 		browser.findElement(saveButtonBy).click();
diff --git a/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java b/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java
index e73dc392253e33a9c245c432d806f8bb673aed28..6bcafb7a3b1507266bcb6929412af6fb8ca1e135 100644
--- a/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java
+++ b/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java
@@ -117,6 +117,7 @@ public class GroupTaskToCoachPage {
 		
 		By inputBy = By.cssSelector(".o_fileinput input[type='file']");
 		OOGraphene.uploadFile(inputBy, correctionFile, browser);
+		OOGraphene.waitBusy(browser);
 		
 		By saveButtonBy = By.cssSelector(".o_sel_course_gta_upload_form button.btn-primary");
 		browser.findElement(saveButtonBy).click();