diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py
index e9de30c957..584141592d 100644
--- a/common/test/acceptance/pages/studio/container.py
+++ b/common/test/acceptance/pages/studio/container.py
@@ -62,7 +62,6 @@ class ContainerPage(PageObject):
             target, 0, target.size['height'] / 2 if after else 0
         ).perform()  # pylint: disable=protected-access
         action.release().perform()
-        # TODO: should wait for "Saving" to go away so we know the operation is complete?
 
 
 class XBlockWrapper(PageObject):
diff --git a/common/test/acceptance/tests/test_studio_container.py b/common/test/acceptance/tests/test_studio_container.py
index 80d51635d4..8d9b2617c4 100644
--- a/common/test/acceptance/tests/test_studio_container.py
+++ b/common/test/acceptance/tests/test_studio_container.py
@@ -99,6 +99,7 @@ class DragAndDropTest(ContainerBase):
                         "Number of children incorrect for group {0}. Expected {1} but got {2}.".format(parent, expected_length, len(children)))
                     for idx, expected in enumerate(expected_ordering.get(parent)):
                         self.assertEqual(expected, children[idx].name)
+                    break
 
     def drag_and_verify(self, source, target, expected_ordering, after=True):
         container = self.go_to_container_page(make_draft=True)