diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php
index 67aa971..d86e993 100644
--- a/code/BasicFieldsTestPage.php
+++ b/code/BasicFieldsTestPage.php
@@ -40,12 +40,16 @@ class BasicFieldsTestPage extends TestPage {
 		'OptionSet' => 'TestCategory',
 		'GroupedDropdown' => 'TestCategory',
 		'ListboxField' => 'TestCategory',
-		'Image' => 'Image',
-		'Image2' => 'Image',
-		'Image3' => 'Image',
 		'File' => 'File',
-		'File2' => 'File',
-		'File3' => 'File',
+		'Image' => 'Image',
+	);
+
+	static $has_many = array(
+		'HasManyFiles' => 'File',
+	);
+
+	static $many_many = array(
+		'ManyManyFiles' => 'File',
 	);
 	
 	static $defaults = array(
@@ -58,7 +62,7 @@ class BasicFieldsTestPage extends TestPage {
 	function getCMSFields() {
 		$fields = parent::getCMSFields();
 		
-		$fields->addFieldsToTab('Root.Content.TextTests', array(
+		$fields->addFieldsToTab('Root.Text', array(
 			new ReadonlyField('Readonly', 'ReadonlyField'),
 			new TextareaField('Textarea', 'TextareaField - 8 rows', 8),
 			new TextField('Text', 'TextField'),
@@ -68,15 +72,16 @@ class BasicFieldsTestPage extends TestPage {
 			new AjaxUniqueTextField('AjaxUniqueText', 'AjaxUniqueTextField', 'AjaxUniqueText', 'BasicFieldsTestPage'),
 		));
 		
-		$fields->addFieldsToTab('Root.Content.NumericTests', array(
+		$fields->addFieldsToTab('Root.Numeric', array(
 			new NumericField('Number', 'NumericField'),
 			new CurrencyField('Price', 'CurrencyField'),
 			new PhoneNumberField('PhoneNumber', 'PhoneNumberField'),
 			new CreditCardField('CreditCard', 'CreditCardField')
 		));
 		
-		$fields->addFieldsToTab('Root.Content.OptionTests', array(
+		$fields->addFieldsToTab('Root.Option', array(
 			new CheckboxField('Checkbox', 'CheckboxField'),
+			new CheckboxSetField('CheckboxSet', 'CheckboxSetField', TestCategory::map()),
 			new DropdownField('DropdownID', 'DropdownField', TestCategory::map()),
 			new GroupedDropdownField('GroupedDropdownID', 'GroupedDropdown', array('Test Categorys' => TestCategory::map())),
 			new ListboxField('ListboxFieldID', 'ListboxField', TestCategory::map(), array(), 3),
@@ -84,7 +89,7 @@ class BasicFieldsTestPage extends TestPage {
 		));
 
 		// All these date/time fields generally have issues saving directly in the CMS
-		$fields->addFieldsToTab('Root.Content.DateTimeTests', array(
+		$fields->addFieldsToTab('Root.DateTime', array(
 			$calendarDateField = new DateField('CalendarDate','DateField with calendar'),
 			new DateField('Date','DateField'),
 			new DateField_Disabled("DateDisabled","DateField (disabled)"),
@@ -102,13 +107,11 @@ class BasicFieldsTestPage extends TestPage {
 		$dateTimeShowCalendar->getDateField()->setConfig('showcalendar', true);
 		$dateTimeShowCalendar->getTimeField()->setConfig('showdropdown', true);
 
-		$fields->addFieldsToTab('Root.Content.FileTests', array(
-			new ImageField('Image','ImageField'),
-			new SimpleImageField('Image2','SimpleImageField'),
-			new ImageField('Image3','ImageField'),
-			new FileIFrameField('File','FileIFrameField'),
-			new FileField('File2','FileField'),
-			new FileIFrameField('File3','FileIFrameField'),
+		$fields->addFieldsToTab('Root.File', array(
+			FormField::create('UploadField', 'File','FileUploadField'),
+			FormField::create('UploadField', 'Image','ImageUploadField'),
+			FormField::create('UploadField', 'HasManyFiles','HasManyFilesUploadField'),
+			FormField::create('UploadField', 'ManyManyFiles','ManyManyFilesUploadField')
 		));
 
 		return $fields;
diff --git a/code/CMSSubTreeAdmin.php b/code/CMSSubTreeAdmin.php
index e4bceab..68e4fcf 100644
--- a/code/CMSSubTreeAdmin.php
+++ b/code/CMSSubTreeAdmin.php
@@ -3,7 +3,7 @@
 /**
  * Test a subtree-admin that only shows the children of a FTPageHolder
  */
-class CMSSubTreeAdmin extends CMSMain {
+class CMSSubTreeAdmin extends CMSPagesController {
 	// These variables are 2.3-specific; in 2.2.x you will need to edit _config.php
 	static $url_segment = 'subtree';
 	static $menu_title = 'FT Pages';
@@ -16,10 +16,6 @@ class CMSSubTreeAdmin extends CMSMain {
 			$ftRoot->write();
 		}
 		
-		// This code is what you will need to do to make a subtree version of CMSMain
-		$this->generateDataTreeHints();
-		$this->generateTreeStylingJS();
-		
 		// ftRoot->ID is your root node
 		$siteTree = $this->getSiteTreeFor("SiteTree", $ftRoot->ID);
 		
diff --git a/code/RelationFieldsTestPage.php b/code/RelationFieldsTestPage.php
index 7e71422..bce0358 100644
--- a/code/RelationFieldsTestPage.php
+++ b/code/RelationFieldsTestPage.php
@@ -14,29 +14,29 @@ class RelationFieldsTestPage extends TestPage {
 	function getCMSFields() {
 		$fields = parent::getCMSFields();
 		
-		$fields->addFieldToTab("Root.Content.CheckboxSet",
+		$fields->addFieldToTab("Root.CheckboxSet",
 			new CheckboxSetField("CheckboxSet", "CheckboxSetField", TestCategory::map()));
 
-		/*
-		$fields->addFieldToTab("Root.Content.ComplexTableField", 
+		$fields->addFieldToTab("Root.CTF", 
 			new ComplexTableField($this, "Items", "TestCTFItem", array(
 				"Title" => "Item Title", 
 				"Author" => "Item Author")));
-			*/
 
-		$fields->addFieldToTab("Root.Content.HasOneComplexTableField", 
-			new HasOneComplexTableField($this, "FavouriteItem", "TestCTFItem", array(
-				"Title" => "Item Title", 
-				"Author" => "Item Author")));
+		// TODO Fix legacy relation CTFs in 3.0
 
-		$fields->addFieldToTab("Root.Content.HasManyComplexTableField", 
-			new HasManyComplexTableField($this, "Items", "TestCTFItem", array(
-				"Title" => "Item Title", 
-				"Author" => "Item Author")));
+		// $fields->addFieldToTab("Root.HasOneCTF", 
+		// 	new HasOneComplexTableField($this, "FavouriteItem", "TestCTFItem", array(
+		// 		"Title" => "Item Title", 
+		// 		"Author" => "Item Author")));
 
-		$fields->addFieldToTab("Root.Content.ManyManyComplexTableField", 
-			new ManyManyComplexTableField($this, "CheckboxSet", "TestCategory", array(
-				"Title" => "Item Title")));
+		// $fields->addFieldToTab("Root.HasManyCTF", 
+		// 	new HasManyComplexTableField($this, "Items", "TestCTFItem", array(
+		// 		"Title" => "Item Title", 
+		// 		"Author" => "Item Author")));
+
+		// $fields->addFieldToTab("Root.ManyManyCTF", 
+		// 	new ManyManyComplexTableField($this, "CheckboxSet", "TestCategory", array(
+		// 		"Title" => "Item Title")));
 
 
 //		$fields->addFieldToTab("Root.Tests.ComplexTableField", 
diff --git a/code/TestCategory.php b/code/TestCategory.php
index 9a868cc..36505c0 100644
--- a/code/TestCategory.php
+++ b/code/TestCategory.php
@@ -16,7 +16,7 @@ class TestCategory extends DataObject {
 	 */
 	static function map() {
 		$categories = DataObject::get('TestCategory');
-		if($categories) return $categories->map('ID', 'Title');
+		if($categories) return $categories->map('ID', 'Title')->toArray();
 		else return array();
 	}