diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 1f1bd0e5..6fc51f63 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -635,41 +635,27 @@ JS;
 			$node = DataObject::get_by_id($this->stat('tree_class'), $id);
 			if($node){
 				if($node && !$node->canEdit()) return Security::permissionFailure($this);
-				
+			
 				$node->ParentID = $parentID;
-				$node->Status = "Saved (update)";
 				$node->write();
-
-				if(is_numeric($_REQUEST['CurrentlyOpenPageID'])) {
-					$currentPage = DataObject::get_by_id($this->stat('tree_class'), $_REQUEST['CurrentlyOpenPageID']);
-					if($currentPage) {
-						$cleanupJS = $currentPage->cmsCleanup_parentChanged();
-					}
-				}
-
-		$node = DataObject::get_by_id($this->stat('tree_class'), $id);
-		if($node){
-			if($node && !$node->canEdit()) return Security::permissionFailure($this);
 			
-			$node->ParentID = $parentID;
-			$node->write();
-			
-			$statusUpdates['modified'][$node->ID] = array(
-				'TreeTitle'=>$node->TreeTitle
-			);
+				$statusUpdates['modified'][$node->ID] = array(
+					'TreeTitle'=>$node->TreeTitle
+				);
 
-			$this->response->addHeader(
-				'X-Status',
-				_t('LeftAndMain.SAVED','saved')
-			);
-		}else{
-			$this->response->setStatusCode(
-				500,
-				_t(
-					'LeftAndMain.PLEASESAVE',
-					"Please Save Page: This page could not be upated because it hasn't been saved yet."
-				)
-			);
+				$this->response->addHeader(
+					'X-Status',
+					_t('LeftAndMain.SAVED','saved')
+				);
+			}else{
+				$this->response->setStatusCode(
+					500,
+					_t(
+						'LeftAndMain.PLEASESAVE',
+						"Please Save Page: This page could not be upated because it hasn't been saved yet."
+					)
+				);
+			}
 		}
 		
 		return Convert::raw2json($statusUpdates);
@@ -870,7 +856,6 @@ JS;
 				new FormAction('doAdd', _t('AssetAdmin_left.ss.GO','Go'))
 			)
 		);
-		$form->setValidator(null);
 		$form->addExtraClass('actionparams');
 		
 		return $form;
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 90769c81..d13d51a2 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -39,11 +39,12 @@ class CMSMainTest extends FunctionalTest {
 			sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 5), 
 			$response->getBody()
 		);
-
+	
 		$response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => '1,2', 'ajax' => 1), $this->session());
 		
-		$this->assertContains('setNodeTitle(1, \'Page 1\');', $response->getBody());
-		$this->assertContains('setNodeTitle(2, \'Page 2\');', $response->getBody());
+		$responseData = Convert::json2array($response->getBody());
+		$this->assertTrue(property_exists($responseData['modified'], '1'));
+		$this->assertTrue(property_exists($responseData['modified'], '2'));
 		
 		$this->session()->clear('loggedInAs');
 		
diff --git a/tests/SecurityAdminTest.php b/tests/SecurityAdminTest.php
index 035c9a5e..02d94f06 100644
--- a/tests/SecurityAdminTest.php
+++ b/tests/SecurityAdminTest.php
@@ -10,11 +10,11 @@ class SecurityAdminTest extends FunctionalTest {
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
 		
 		/* First, open the applicable group */
-		$this->get('admin/security/getitem?ID=' . $this->idFromFixture('Group','admin'));
+		$this->get('admin/security/show/' . $this->idFromFixture('Group','admin'));
 		$this->assertRegExp('/<input[^>]+id="Form_EditForm_Title"[^>]+value="Administrators"[^>]*>/',$this->content());
 		
 		/* Then load the export page */
-		$this->get('admin/security//EditForm/field/Members/export');
+		$this->get('admin/security/EditForm/field/Members/export');
 		$lines = preg_split('/\n/', $this->content());
 		
 		$this->assertEquals(count($lines), 3, "Export with members has one content row");
@@ -25,7 +25,7 @@ class SecurityAdminTest extends FunctionalTest {
 		$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
 		
 		/* First, open the applicable group */
-		$this->get('admin/security/getitem?ID=' . $this->idFromFixture('Group','empty'));
+		$this->get('admin/security/show/' . $this->idFromFixture('Group','empty'));
 		$this->assertRegExp('/<input[^>]+id="Form_EditForm_Title"[^>]+value="Empty Group"[^>]*>/',$this->content());
 		
 		/* Then load the export page */