diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
index de81eb6ab3c5462c77132867b0d88c2d2dd5c1e3..4030b22fc1471fd28b30a280fb6fb8e6ee6a2b3c 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
@@ -486,7 +486,8 @@ public class AssessmentTestComposerController extends MainLayoutBasicController
 				}
 				
 			} else if(droppedObject instanceof AssessmentSection
-					&& (targetObject instanceof AssessmentSection || targetObject instanceof TestPart)) {
+					&& (targetObject instanceof AssessmentSection || targetObject instanceof TestPart
+							|| (targetObject instanceof AssessmentTest && ((AssessmentTest)targetObject).getTestParts().size() == 1))) {
 				AssessmentSection droppedSection = (AssessmentSection)droppedObject;
 				if(droppedSection.getParentSection() != null) {
 					droppedSection.getParentSection().getSectionParts().remove(droppedSection);
@@ -499,6 +500,9 @@ public class AssessmentTestComposerController extends MainLayoutBasicController
 				} else if(targetObject instanceof TestPart) {
 					TestPart targetTestPart = (TestPart)targetObject;
 					targetTestPart.getAssessmentSections().add(droppedSection);
+				} else if(targetObject instanceof AssessmentTest) {
+					TestPart targetTestPart = ((AssessmentTest)targetObject).getTestParts().get(0);
+					targetTestPart.getAssessmentSections().add(droppedSection);
 				}
 			}
 		} else {
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestEditorAndComposerTreeModel.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestEditorAndComposerTreeModel.java
index 4b37cfad01669e333fd54a3cf7e14f21c00c1e40..741e2c8459bbf310c69c7cd90cd11fbd6906ef4c 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestEditorAndComposerTreeModel.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestEditorAndComposerTreeModel.java
@@ -144,7 +144,9 @@ public class AssessmentTestEditorAndComposerTreeModel extends GenericTreeModel i
 	public boolean isNodeDroppable(TreeNode node) {
 		if(node == null) return false;
 		Object uobject = node.getUserObject();
-		return uobject instanceof AssessmentSection || uobject instanceof TestPart || uobject instanceof AssessmentItemRef;
+		return uobject instanceof AssessmentSection || uobject instanceof TestPart
+				|| uobject instanceof AssessmentItemRef
+				|| (uobject instanceof AssessmentTest && ((AssessmentTest)uobject).getTestParts().size() == 1);
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
index d1ec0954b0be2b48cfab3eff70def81c8a2910f4..167c6c91a10b50ca9118cb97601745e1c249d920 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
@@ -88,7 +88,7 @@ form.testPart.navigationMode.linear=Linear
 form.testPart.navigationMode.nonlinear=Nicht linear
 form.unkown=Unbekannt
 item.session.control.allow.comment=Kommentar erlauben
-item.session.control.allow.review=Review erlauben
+item.session.control.allow.review=R\u00FCckblick erlauben
 item.session.control.attempts=Versuch
 item.session.control.show.solution=L\u00F6sung anzeigen
 max.score=Maximal erreichbare Punktzahl