diff --git a/tests/TestCase/Controller/CountriesControllerTest.php b/tests/TestCase/Controller/CountriesControllerTest.php
index 47f67c4..3799407 100644
--- a/tests/TestCase/Controller/CountriesControllerTest.php
+++ b/tests/TestCase/Controller/CountriesControllerTest.php
@@ -41,8 +41,7 @@ class CountriesControllerTest extends BaseControllerTest
     protected function setUp(): void
     {
         parent::setUp();
-        $this->Countries = $this->getTableLocator()->get('Countries');
-        $this->enableCsrfToken();
+        $this->Countries = $this->getTableLocator()->get('CakeAddresses.Countries');
     }
 
     /**
@@ -57,28 +56,6 @@ class CountriesControllerTest extends BaseControllerTest
         parent::tearDown();
     }
 
-    /**
-    * Test index method
-    *
-    * Tests the index action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\CountriesController::index()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testIndexGetUnauthenticated(): void
-    {
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'Countries',
-            'action' => 'index',
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test index method
     *
@@ -89,9 +66,8 @@ class CountriesControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testIndexGetLoggedIn(): void
+    public function testIndexGet(): void
     {
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'Countries',
@@ -101,30 +77,6 @@ class CountriesControllerTest extends BaseControllerTest
         $this->assertResponseCode(200);
     }
 
-    /**
-    * Test view method
-    *
-    * Tests the view action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\CountriesController::view()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testViewGetUnauthenticated(): void
-    {
-        $id = 233;
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'Countries',
-            'action' => 'view',
-            $id,
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test view method
     *
@@ -135,10 +87,9 @@ class CountriesControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testViewGetLoggedIn(): void
+    public function testViewGet(): void
     {
         $id = 233;
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'Countries',
diff --git a/tests/TestCase/Controller/RegionsControllerTest.php b/tests/TestCase/Controller/RegionsControllerTest.php
index 044b105..e1cf758 100644
--- a/tests/TestCase/Controller/RegionsControllerTest.php
+++ b/tests/TestCase/Controller/RegionsControllerTest.php
@@ -43,8 +43,7 @@ class RegionsControllerTest extends BaseControllerTest
     protected function setUp(): void
     {
         parent::setUp();
-        $this->Regions = $this->getTableLocator()->get('Regions');
-        $this->enableCsrfToken();
+        $this->Regions = $this->getTableLocator()->get('CakeAddresses.Regions');
     }
 
     /**
@@ -59,28 +58,6 @@ class RegionsControllerTest extends BaseControllerTest
         parent::tearDown();
     }
 
-    /**
-    * Test index method
-    *
-    * Tests the index action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\RegionsController::index()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testIndexGetUnauthenticated(): void
-    {
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'Regions',
-            'action' => 'index',
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test index method
     *
@@ -91,9 +68,8 @@ class RegionsControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testIndexGetLoggedIn(): void
+    public function testIndexGet(): void
     {
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'Regions',
@@ -103,30 +79,6 @@ class RegionsControllerTest extends BaseControllerTest
         $this->assertResponseCode(200);
     }
 
-    /**
-    * Test view method
-    *
-    * Tests the view action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\RegionsController::view()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testViewGetUnauthenticated(): void
-    {
-        $id = 1;
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'Regions',
-            'action' => 'view',
-            $id,
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test view method
     *
@@ -137,11 +89,10 @@ class RegionsControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testViewGetLoggedIn(): void
+    public function testViewGet(): void
     {
         $id = 1;
 
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'Regions',
diff --git a/tests/TestCase/Controller/StatesControllerTest.php b/tests/TestCase/Controller/StatesControllerTest.php
index 0af1f9c..31821e8 100644
--- a/tests/TestCase/Controller/StatesControllerTest.php
+++ b/tests/TestCase/Controller/StatesControllerTest.php
@@ -40,8 +40,7 @@ class StatesControllerTest extends BaseControllerTest
     protected function setUp(): void
     {
         parent::setUp();
-        $this->States = $this->getTableLocator()->get('States');
-        $this->enableCsrfToken();
+        $this->States = $this->getTableLocator()->get('CakeAddresses.States');
     }
 
     /**
@@ -56,28 +55,6 @@ class StatesControllerTest extends BaseControllerTest
         parent::tearDown();
     }
 
-    /**
-    * Test index method
-    *
-    * Tests the index action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\StatesController::index()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testIndexGetUnauthenticated(): void
-    {
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'States',
-            'action' => 'index',
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test index method
     *
@@ -88,9 +65,8 @@ class StatesControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testIndexGetLoggedIn(): void
+    public function testIndexGet(): void
     {
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'States',
@@ -100,30 +76,6 @@ class StatesControllerTest extends BaseControllerTest
         $this->assertResponseCode(200);
     }
 
-    /**
-    * Test view method
-    *
-    * Tests the view action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\StatesController::view()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testViewGetUnauthenticated(): void
-    {
-        $id = 1462;
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'States',
-            'action' => 'view',
-            $id,
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test view method
     *
@@ -134,10 +86,9 @@ class StatesControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testViewGetLoggedIn(): void
+    public function testViewGet(): void
     {
         $id = 1462;
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'States',
diff --git a/tests/TestCase/Controller/SubregionsControllerTest.php b/tests/TestCase/Controller/SubregionsControllerTest.php
index c2aea2e..b103aee 100644
--- a/tests/TestCase/Controller/SubregionsControllerTest.php
+++ b/tests/TestCase/Controller/SubregionsControllerTest.php
@@ -43,7 +43,7 @@ class SubregionsControllerTest extends BaseControllerTest
     protected function setUp(): void
     {
         parent::setUp();
-        $this->Subregions = $this->getTableLocator()->get('Subregions');
+        $this->Subregions = $this->getTableLocator()->get('CakeAddresses.Subregions');
         $this->enableCsrfToken();
     }
 
@@ -59,28 +59,6 @@ class SubregionsControllerTest extends BaseControllerTest
         parent::tearDown();
     }
 
-    /**
-    * Test index method
-    *
-    * Tests the index action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\SubregionsController::index()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testIndexGetUnauthenticated(): void
-    {
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'Subregions',
-            'action' => 'index',
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test index method
     *
@@ -91,9 +69,8 @@ class SubregionsControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testIndexGetLoggedIn(): void
+    public function testIndexGet(): void
     {
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'Subregions',
@@ -103,30 +80,6 @@ class SubregionsControllerTest extends BaseControllerTest
         $this->assertResponseCode(200);
     }
 
-    /**
-    * Test view method
-    *
-    * Tests the view action with an unauthenticated user (not logged in)
-    *
-    * @uses \CakeAddresses\Controller\SubregionsController::view()
-    * @throws Exception
-    *
-    * @return void
-    */
-    public function testViewGetUnauthenticated(): void
-    {
-        $id = 1;
-        $url = [
-            'plugin' => 'CakeAddresses',
-            'controller' => 'Subregions',
-            'action' => 'view',
-            $id,
-        ];
-        $this->get($url);
-        $this->assertResponseCode(302);
-        $this->assertRedirectContains('login');
-    }
-
     /**
     * Test view method
     *
@@ -137,11 +90,10 @@ class SubregionsControllerTest extends BaseControllerTest
     *
     * @return void
     */
-    public function testViewGetLoggedIn(): void
+    public function testViewGet(): void
     {
         $id = 1;
 
-        $this->loginUserByRole();
         $url = [
             'plugin' => 'CakeAddresses',
             'controller' => 'Subregions',