diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 607d75a8..4a9d3459 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -183,8 +183,8 @@ class LeftAndMain extends Controller {
 				$theme = false;
 			}
 			
-			if($theme) $cssFiles .= ', ' . THEMES_DIR . "/{$theme}/css/editor.css";
-			else if(project()) $cssFiles .= ', ' . project() . '/css/editor.css';
+			if($theme) $cssFiles .= ',' . THEMES_DIR . "/{$theme}/css/editor.css";
+			else if(project()) $cssFiles .= ',' . project() . '/css/editor.css';
 
 			$htmlEditorConfig->setOption('content_css', $cssFiles);
 		}
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 3508ad8e..b7cc8431 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -150,7 +150,7 @@ class CMSMainTest extends FunctionalTest {
 		$response = $this->get('admin/cms/getitem?ID=' . $pageID . '&ajax=1');
 	
 		$livePage = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
-		$this->assertType('SiteTree', $livePage);
+		$this->assertInstanceOf('SiteTree', $livePage);
 		$this->assertTrue($livePage->canDelete());
 	
 		// Check that the 'restore' button exists as a simple way of checking that the correct page is returned.
@@ -174,12 +174,12 @@ class CMSMainTest extends FunctionalTest {
 		$this->assertNull($cmsMain->getRecord('asdf'));
 		
 		// Pages that are on draft and aren't on draft should both work
-		$this->assertType('Page', $cmsMain->getRecord($page1ID));
-		$this->assertType('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
+		$this->assertInstanceOf('Page', $cmsMain->getRecord($page1ID));
+		$this->assertInstanceOf('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
 	
 		// This functionality isn't actually used any more.
 		$newPage = $cmsMain->getRecord('new-Page-5');
-		$this->assertType('Page', $newPage);
+		$this->assertInstanceOf('Page', $newPage);
 		$this->assertEquals('5', $newPage->ParentID);
 	
 	}
diff --git a/tests/CMSMenuTest.php b/tests/CMSMenuTest.php
index ef3387e9..75fe7e45 100644
--- a/tests/CMSMenuTest.php
+++ b/tests/CMSMenuTest.php
@@ -16,7 +16,7 @@ class CMSMenuTest extends SapphireTest implements TestOnly {
 		CMSMenu::add_controller('CMSMain');
 		$menuItems = CMSMenu::get_menu_items();
 		$menuItem = $menuItems['CMSMain'];
-		$this->assertType('CMSMenuItem', $menuItem, 'Controller menu item is of class CMSMenuItem');
+		$this->assertInstanceOf('CMSMenuItem', $menuItem, 'Controller menu item is of class CMSMenuItem');
 		$this->assertEquals($menuItem->url, singleton('CMSMain')->Link(), 'Controller menu item has the correct link');
 		$this->assertEquals($menuItem->controller, 'CMSMain', 'Controller menu item has the correct controller class');
 		$this->assertEquals($menuItem->priority, singleton('CMSMain')->stat('menu_priority'), 'Controller menu item has the correct priority');				
@@ -26,7 +26,7 @@ class CMSMenuTest extends SapphireTest implements TestOnly {
 		CMSMenu::add_link('LinkCode', 'link title', 'http://www.example.com');
 		$menuItems = CMSMenu::get_menu_items();
 		$menuItem = $menuItems['LinkCode'];
-		$this->assertType('CMSMenuItem', $menuItem, 'Link menu item is of class CMSMenuItem');
+		$this->assertInstanceOf('CMSMenuItem', $menuItem, 'Link menu item is of class CMSMenuItem');
 		$this->assertEquals($menuItem->title, 'link title', 'Link menu item has the correct title');
 		$this->assertEquals($menuItem->url,'http://www.example.com', 'Link menu item has the correct link');
 		$this->assertNull($menuItem->controller, 'Link menu item has no controller class');
@@ -53,7 +53,7 @@ class CMSMenuTest extends SapphireTest implements TestOnly {
 		CMSMenu::clear_menu();
 		CMSMenu::populate_menu();
 		$menuItem = CMSMenu::get_menu_item('CMSMain');
-		$this->assertType('CMSMenuItem', $menuItem, 'CMSMain menu item exists');
+		$this->assertInstanceOf('CMSMenuItem', $menuItem, 'CMSMain menu item exists');
 		$this->assertEquals($menuItem->url, singleton('CMSMain')->Link(), 'Menu item has the correct link');
 		$this->assertEquals($menuItem->controller, 'CMSMain', 'Menu item has the correct controller class');
 		$this->assertEquals(
diff --git a/tests/LeftAndMainTest.php b/tests/LeftAndMainTest.php
index 96752eb7..0c0a76af 100644
--- a/tests/LeftAndMainTest.php
+++ b/tests/LeftAndMainTest.php
@@ -49,7 +49,7 @@ class LeftAndMainTest extends FunctionalTest {
 
 			$response = $this->get($link);
 			
-			$this->assertType('SS_HTTPResponse', $response, "$link should return a response object");
+			$this->assertInstanceOf('SS_HTTPResponse', $response, "$link should return a response object");
 			$this->assertEquals(200, $response->getStatusCode(), "$link should return 200 status code");
 			// Check that a HTML page has been returned
 			$this->assertRegExp('/<html[^>]*>/i', $response->getBody(), "$link should contain <html> tag");
diff --git a/tests/MemberTableFieldTest.php b/tests/MemberTableFieldTest.php
index e5e9694b..79952e45 100644
--- a/tests/MemberTableFieldTest.php
+++ b/tests/MemberTableFieldTest.php
@@ -72,7 +72,7 @@ class MemberTableFieldTest extends FunctionalTest {
 		$this->assertNotContains($member1->ID, $group1->Members()->column('ID'),
 			'Member relation to group is removed'
 		);
-		$this->assertType(
+		$this->assertInstanceOf(
 			'DataObject',
 			DataObject::get_by_id('Member', $member1->ID),
 			'Member record still exists'