Fix failing tests.

tests/TestCase/View/Helper/FormHelperTest.php

@@ -1931,7 +1931,7 @@ class FormHelperTest extends TestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		unset($this->Form->request->data);
+		$this->Form->request->data = [];
 
 		$entity->errors('field', 'Badness!');
 		$this->Form->create($entity, ['context' => ['table' => 'Contacts']]);

tests/TestCase/View/HelperRegistryTest.php

@@ -18,13 +18,13 @@ use Cake\Core\App;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 use Cake\View\HelperRegistry;
-use Cake\View\Helper\HtmlHelper;
+use Cake\View\Helper;
 use Cake\View\View;
 
 /**
  * Extended HtmlHelper
  */
-class HtmlAliasHelper extends HtmlHelper {
+class HtmlAliasHelper extends Helper {
 
 	public function afterRender($viewFile) {
 	}