diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php
index 43efcd2..0f839fe 100644
--- a/code/extensions/SiteTreeSubsites.php
+++ b/code/extensions/SiteTreeSubsites.php
@@ -92,13 +92,13 @@ class SiteTreeSubsites extends DataExtension {
 		$subsite = $this->owner->Subsite();
 		if($subsite && $subsite->ID) {
 			$baseUrl = 'http://' . $subsite->domain() . '/';
-			
 			$baseLink = Controller::join_links (
 				$baseUrl,
 				(SiteTree::nested_urls() && $this->owner->ParentID ? $this->owner->Parent()->RelativeLink(true) : null)
 			);
 			
 			$url = (strlen($baseLink) > 36 ? "..." .substr($baseLink, -32) : $baseLink);
+
 			$urlsegment = $fields->dataFieldByName('URLSegment');
 			$urlsegment->setURLPrefix($url);
 		}
diff --git a/tests/SubsiteTest.php b/tests/SubsiteTest.php
index 47c7a62..9a23155 100644
--- a/tests/SubsiteTest.php
+++ b/tests/SubsiteTest.php
@@ -53,14 +53,8 @@ class SubsiteTest extends BaseSubsiteTest {
 		$this->assertEquals($subsite->ID, $siteHome->SubsiteID,
 			'createInstance() copies existing pages retaining the same URLSegment'
 		);
-		$this->assertEquals($siteHome->MasterPageID, $tmplHome->ID, 'Check master page value');
-		
-		// Check linking of child pages
-		$siteStaff = DataObject::get_one('Page', "\"URLSegment\" = '" . Convert::raw2sql($tmplStaff->URLSegment) . "'");
-		$this->assertEquals($siteStaff->MasterPageID, $tmplStaff->ID);
 		
 		Subsite::changeSubsite(0);
-		
 	}
 	
 	/**
@@ -239,14 +233,11 @@ class SubsiteTest extends BaseSubsiteTest {
 		$_SERVER['HTTP_HOST'] = "mysite.example.org";
 		$this->assertEquals('three.mysite.example.org', 
 			$this->objFromFixture('Subsite','domaintest3')->domain());
-			
-			
+
 		$this->assertEquals($_SERVER['HTTP_HOST'], singleton('Subsite')->PrimaryDomain);
 		$this->assertEquals('http://'.$_SERVER['HTTP_HOST'].Director::baseURL(), singleton('Subsite')->absoluteBaseURL());
 
-
 		$_SERVER['HTTP_HOST'] = $originalHTTPHost;
-
 	}
 	
 	/**
@@ -344,4 +335,4 @@ class SubsiteTest extends BaseSubsiteTest {
 		$subsite2->activate();
 		$this->assertEquals('MyNewAwesomePage', DataObject::get_by_id('Page', $page2->ID)->Title);
 	}
-}
\ No newline at end of file
+}