diff --git a/Test/Case/Model/Video/DeleteVideoTest.php b/Test/Case/Model/Video/DeleteVideoTest.php
index 882e4d8..308acb7 100644
--- a/Test/Case/Model/Video/DeleteVideoTest.php
+++ b/Test/Case/Model/Video/DeleteVideoTest.php
@@ -41,6 +41,8 @@ class VideoDeleteVideoTest extends WorkflowDeleteTest {
 		'plugin.content_comments.content_comment',
 		'plugin.site_manager.site_setting',
 		'plugin.categories.category',
+		'plugin.categories.category_order',
+		'plugin.categories.categories_language',
 	);
 
 /**
diff --git a/Test/Case/Model/VideoSetting/SaveVideoSettingTest.php b/Test/Case/Model/VideoSetting/SaveVideoSettingTest.php
index 640be22..43a2deb 100644
--- a/Test/Case/Model/VideoSetting/SaveVideoSettingTest.php
+++ b/Test/Case/Model/VideoSetting/SaveVideoSettingTest.php
@@ -27,6 +27,10 @@ class VideoSettingSaveVideoSettingTest extends NetCommonsSaveTest {
  */
 	public $fixtures = array(
 		'plugin.videos.video_setting',
+		'plugin.videos.video',
+		'plugin.categories.category',
+		'plugin.categories.category_order',
+		'plugin.categories.categories_language',
 	);
 
 /**
diff --git a/View/VideosEdit/edit.ctp b/View/VideosEdit/edit.ctp
index 4ef6283..f4fa83d 100644
--- a/View/VideosEdit/edit.ctp
+++ b/View/VideosEdit/edit.ctp
@@ -103,7 +103,7 @@ $video = NetCommonsAppController::camelizeKeyRecursive(array('video' => $this->d
 				'key' => $this->request->data('Video.key')
 			))); ?>
 
-		<?php echo $this->Form->end(); ?>
+		<?php echo $this->NetCommonsForm->end(); ?>
 
 		<?php if ($this->Workflow->canDelete('Videos.Video', $this->request->data('Video'))) : ?>
 			<div class="panel-footer">