diff --git a/tests/ModelTest.php b/tests/ModelTest.php
index fcc9a73f..cab56d6f 100644
--- a/tests/ModelTest.php
+++ b/tests/ModelTest.php
@@ -1,21 +1,29 @@
 <?php
 
+use Nano\NanoBaseTest;
+use Nano\TestApp\TestModel;
+
 /**
  * Set of unit tests for Model class
+ *
+ * @covers TestModel
  */
-class ModelTest extends \Nano\NanoBaseTest
+class ModelTest extends NanoBaseTest
 {
+    /**
+     * @var TestModel
+     */
+    private $model;
+
     public function setUp(): void
     {
-        $dir = realpath(dirname(__FILE__) . '/app');
-        $this->app = Nano::app($dir);
+        parent::setUp();
+        $this->model = new TestModel();
     }
 
     public function testGetMagic()
     {
-        $model = $this->app->factory('TestModel');
-
-        $this->assertEquals($model->getData(), ['foo' => 'bar']);
-        $this->assertEquals($model->getFoo(), 'bar');
+        $this->assertEquals(['foo' => 'bar'], $this->model->getData());
+        $this->assertEquals('bar', $this->model->getFoo());
     }
 }
diff --git a/tests/app/classes/TestModel.php b/tests/app/classes/TestModel.php
index e3a440ed..9c94023d 100644
--- a/tests/app/classes/TestModel.php
+++ b/tests/app/classes/TestModel.php
@@ -1,17 +1,17 @@
 <?php
 
+namespace Nano\TestApp;
+
 /**
  * An example model
+ *
+ * @method array getFoo
  */
-class TestModel extends Model
+class TestModel extends \Model
 {
-
-    /**
-     * @param NanoApp $app
-     */
-    public function __construct(NanoApp $app)
+    public function __construct()
     {
-        parent::__construct($app);
+        parent::__construct();
 
         $this->data = [
             'foo' => 'bar',