diff --git a/tests/Model/LocationTest.php b/tests/Model/LocationTest.php
index 915bbac..7145f57 100644
--- a/tests/Model/LocationTest.php
+++ b/tests/Model/LocationTest.php
@@ -6,7 +6,7 @@
 use Dynamic\Locator\Tests\TestOnlyModel\ExtendedLocation;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\SapphireTest;
-use Dynamic\Locator\Location;
+use Dynamic\Locator\Model\Location;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Security\Member;
 
@@ -215,7 +215,7 @@ public function testUpdateWebsiteURL()
         $clone = Injector::inst()->create(ExtendedLocation::class, $map);
         $clone->ID = 0;
 
-        $this->assertEquals('http://www.dynamicagency.com', $location->getWebsiteURL());
+        $this->assertEquals('https://www.dynamicagency.com', $location->getWebsiteURL());
         $this->assertEquals('foo', $clone->getWebsiteURL());
     }
 }
diff --git a/tests/Model/locationfixture.yml b/tests/Model/locationfixture.yml
index 12fd235..fc7f903 100644
--- a/tests/Model/locationfixture.yml
+++ b/tests/Model/locationfixture.yml
@@ -56,11 +56,11 @@ Dynamic\Locator\Page\Locator:
     Title: Locator
     Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology
 
-Dynamic\Locator\Location:
+Dynamic\Locator\Model\Location:
   dynamic:
     Title: Dynamic, Inc.
     Featured: true
-    Website: "http://www.dynamicagency.com"
+    Website: "https://www.dynamicagency.com"
     Phone: 920-459-8889
     Email: dev@dy.ag
     Address: 1526 S. 12th St
@@ -72,14 +72,14 @@ Dynamic\Locator\Location:
   silverstripe:
     Title: Silverstripe
     Featured: true
-    Website: http://silverstripe.org
+    Website: https://silverstripe.org
     Phone: 555-555-5555
     Email: solutions@silverstripe.com
     Categories: =>Dynamic\Locator\Model\LocationCategory.service
   3sheeps:
     Title: 3 Sheeps Brewing
     Featured: false
-    Website: http://www.3sheepsbrewing.com
+    Website: https://www.3sheepsbrewing.com
     Phone: 555-555-5556
     ShowInLocator: false
     Address: 1327 Huron Ave
diff --git a/tests/Page/LocatorControllerTest.php b/tests/Page/LocatorControllerTest.php
index fd9f24b..fcd4007 100644
--- a/tests/Page/LocatorControllerTest.php
+++ b/tests/Page/LocatorControllerTest.php
@@ -2,7 +2,7 @@
 
 namespace Dynamic\Locator\Tests\Page;
 
-use Dynamic\Locator\Location;
+use Dynamic\Locator\Model\Location;
 use Dynamic\Locator\Model\LocationCategory;
 use Dynamic\Locator\Page\Locator;
 use Dynamic\Locator\Page\LocatorController;
diff --git a/tests/Page/LocatorTest.php b/tests/Page/LocatorTest.php
index a4641d9..7fb7776 100644
--- a/tests/Page/LocatorTest.php
+++ b/tests/Page/LocatorTest.php
@@ -2,7 +2,7 @@
 
 namespace Dynamic\Locator\Tests\Page;
 
-use Dynamic\Locator\Location;
+use Dynamic\Locator\Model\Location;
 use Dynamic\Locator\Page\Locator;
 use Dynamic\Locator\Page\LocatorController;
 use SilverStripe\Core\Config\Config;
diff --git a/tests/Page/locatorfixture.yml b/tests/Page/locatorfixture.yml
index 56cc378..c8130c1 100644
--- a/tests/Page/locatorfixture.yml
+++ b/tests/Page/locatorfixture.yml
@@ -13,11 +13,11 @@ Dynamic\Locator\Page\Locator:
     Title: Locator
     Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology
 
-Dynamic\Locator\Location:
+Dynamic\Locator\Model\Location:
   dynamic:
     Title: Dynamic, Inc.
     Featured: true
-    Website: "http://www.dynamicagency.com"
+    Website: "https://www.dynamicagency.com"
     Phone: 920-459-8889
     Email: dev@dy.ag
     Address: 1526 S. 12th St
@@ -29,14 +29,14 @@ Dynamic\Locator\Location:
   silverstripe:
     Title: Silverstripe
     Featured: true
-    Website: http://silverstripe.org
+    Website: https://silverstripe.org
     Phone: 555-555-5555
     Email: solutions@silverstripe.com
     Categories: =>Dynamic\Locator\Model\LocationCategory.service
   3sheeps:
     Title: 3 Sheeps Brewing
     Featured: false
-    Website: http://www.3sheepsbrewing.com
+    Website: https://www.3sheepsbrewing.com
     Phone: 555-555-5556
     ShowInLocator: false
     Address: 1327 Huron Ave
diff --git a/tests/TestOnly/Model/ExtendedLocation.php b/tests/TestOnly/Model/ExtendedLocation.php
index 4a19dd7..ebbc36f 100644
--- a/tests/TestOnly/Model/ExtendedLocation.php
+++ b/tests/TestOnly/Model/ExtendedLocation.php
@@ -2,7 +2,7 @@
 
 namespace Dynamic\Locator\Tests\TestOnlyModel;
 
-use Dynamic\Locator\Location;
+use Dynamic\Locator\Model\Location;
 use Dynamic\Locator\Tests\TestOnly\Extension\LocationExtension;
 use SilverStripe\Dev\TestOnly;
 
diff --git a/tests/fixtures.yml b/tests/fixtures.yml
index 99e1c94..b08b92b 100644
--- a/tests/fixtures.yml
+++ b/tests/fixtures.yml
@@ -56,11 +56,11 @@ Dynamic\Locator\Page\Locator:
     Title: Locator
     Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology
 
-Dynamic\Locator\Location:
+Dynamic\Locator\Model\Location:
   dynamic:
     Title: Dynamic, Inc.
     Featured: true
-    Website: "http://www.dynamicagency.com"
+    Website: "https://www.dynamicagency.com"
     Phone: 920-459-8889
     Email: dev@dy.ag
     Address: 1526 S. 12th St
@@ -72,14 +72,14 @@ Dynamic\Locator\Location:
   silverstripe:
     Title: Silverstripe
     Featured: true
-    Website: http://silverstripe.org
+    Website: https://silverstripe.org
     Phone: 555-555-5555
     Email: solutions@silverstripe.com
     Categories: =>Dynamic\Locator\Model\LocationCategory.service
   3sheeps:
     Title: 3 Sheeps Brewing
     Featured: false
-    Website: http://www.3sheepsbrewing.com
+    Website: https://www.3sheepsbrewing.com
     Phone: 555-555-5556
     ShowInLocator: false
     Address: 1327 Huron Ave
@@ -103,7 +103,7 @@ Dynamic\Locator\Model\Page\LocationPage:
   dynamic:
     Title: Dynamic, Inc.
     Featured: true
-    Website: "http://www.dynamicagency.com"
+    Website: "https://www.dynamicagency.com"
     Phone: 920-459-8889
     Email: dev@dy.ag
     Address: 1526 S. 12th St
@@ -116,7 +116,7 @@ Dynamic\Locator\Model\Page\LocationPage:
   silverstripe:
     Title: Silverstripe
     Featured: true
-    Website: http://silverstripe.org
+    Website: https://silverstripe.org
     Phone: 555-555-5555
     Email: solutions@silverstripe.com
     Categories: =>Dynamic\Locator\Model\LocationCategory.service
@@ -124,7 +124,7 @@ Dynamic\Locator\Model\Page\LocationPage:
   3sheeps:
     Title: 3 Sheeps Brewing
     Featured: false
-    Website: http://www.3sheepsbrewing.com
+    Website: https://www.3sheepsbrewing.com
     Phone: 555-555-5556
     ShowInLocator: false
     Address: 1327 Huron Ave
diff --git a/tests/form/LocatorFormTest.php b/tests/form/LocatorFormTest.php
index 0d08c3d..3c086fc 100644
--- a/tests/form/LocatorFormTest.php
+++ b/tests/form/LocatorFormTest.php
@@ -2,7 +2,7 @@
 
 namespace Dynamic\Locator\Tests\Form;
 
-use Dynamic\Locator\Location;
+use Dynamic\Locator\Model\Location;
 use Dynamic\Locator\Page\Locator;
 use Dynamic\Locator\Page\LocatorController;
 use Dynamic\Locator\Form\LocatorForm;
diff --git a/tests/form/locatorformfixture.yml b/tests/form/locatorformfixture.yml
index 56cc378..c8130c1 100644
--- a/tests/form/locatorformfixture.yml
+++ b/tests/form/locatorformfixture.yml
@@ -13,11 +13,11 @@ Dynamic\Locator\Page\Locator:
     Title: Locator
     Categories: =>Dynamic\Locator\Model\LocationCategory.service,=>Dynamic\Locator\Model\LocationCategory.technology
 
-Dynamic\Locator\Location:
+Dynamic\Locator\Model\Location:
   dynamic:
     Title: Dynamic, Inc.
     Featured: true
-    Website: "http://www.dynamicagency.com"
+    Website: "https://www.dynamicagency.com"
     Phone: 920-459-8889
     Email: dev@dy.ag
     Address: 1526 S. 12th St
@@ -29,14 +29,14 @@ Dynamic\Locator\Location:
   silverstripe:
     Title: Silverstripe
     Featured: true
-    Website: http://silverstripe.org
+    Website: https://silverstripe.org
     Phone: 555-555-5555
     Email: solutions@silverstripe.com
     Categories: =>Dynamic\Locator\Model\LocationCategory.service
   3sheeps:
     Title: 3 Sheeps Brewing
     Featured: false
-    Website: http://www.3sheepsbrewing.com
+    Website: https://www.3sheepsbrewing.com
     Phone: 555-555-5556
     ShowInLocator: false
     Address: 1327 Huron Ave