diff --git a/_config.php b/_config.php
index 03f34d2..e7212aa 100644
--- a/_config.php
+++ b/_config.php
@@ -13,19 +13,19 @@
 SiteTree::add_extension('FrameworkTestSiteTreeExtension');
 File::add_extension('FrameworkTestFileExtension');
 
-if(class_exists('SiteTreeCMSWorkflow')) {
-	SiteConfig::add_extension('CMSWorkflowSiteConfigDecorator');
-	CMSWorkflowSiteConfigDecorator::apply_active_config();
+if (class_exists('SiteTreeCMSWorkflow')) {
+    SiteConfig::add_extension('CMSWorkflowSiteConfigDecorator');
+    CMSWorkflowSiteConfigDecorator::apply_active_config();
 }
 
-if(@$_GET['db']) {
-	$enabletranslatable = @$_GET['enabletranslatable'];
-} elseif(@$_SESSION['db']) {
-	$enabletranslatable = @$_SESSION['enabletranslatable'];
+if (!empty($_GET['db'])) {
+    $enabletranslatable = $_GET['enabletranslatable'];
+} elseif (!empty($_SESSION['db'])) {
+    $enabletranslatable = $_SESSION['enabletranslatable'];
 } else {
-	$enabletranslatable = null;
+    $enabletranslatable = null;
 }
-if($enabletranslatable) {
-	SiteTree::add_extension('Translatable');
-	SiteConfig::add_extension('Translatable');
+if ($enabletranslatable) {
+    SiteTree::add_extension('Translatable');
+    SiteConfig::add_extension('Translatable');
 }
diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php
index d1fd2c1..df4a3dd 100644
--- a/code/BasicFieldsTestPage.php
+++ b/code/BasicFieldsTestPage.php
@@ -56,8 +56,6 @@ class BasicFieldsTestPage extends TestPage
         'Required' => 'Text',
         'Text' => 'Varchar',
         'Textarea' => 'Text',
-        'Required' => 'Varchar',
-        'Readonly' => 'Varchar',
         'Time' => 'Time',
         'ToggleCompositeTextField1' => 'Varchar',
         'ToggleCompositeDropdownField' => 'Varchar',
diff --git a/code/Company.php b/code/Company.php
index 998f014..a0ae950 100644
--- a/code/Company.php
+++ b/code/Company.php
@@ -2,21 +2,13 @@
 
 namespace SilverStripe\FrameworkTest\Model;
 
-
-
-
-
 use SilverStripe\ORM\ValidationResult;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\Forms\UploadField;
 
-
-
-
 class Company extends DataObject
 {
-
     private static $table_name = 'Company';
 
     /**
@@ -34,7 +26,7 @@ class Company extends DataObject
         'RelationFieldsTestPage' => 'RelationFieldsTestPage',
         'GridFieldTestPageHasOne' => 'GridFieldTestPage'
     );
-    
+
     private static $has_many  = array(
         'Employees' => 'SilverStripe\\FrameworkTest\\Model\\Employee',
         'GroupPhotos' => 'SilverStripe\\Assets\\Image'
@@ -75,20 +67,17 @@ class Company extends DataObject
     public function getCMSFields()
     {
         $fields = parent::getCMSFields();
-        $fields->addFieldToTab('Root.Main',
-            $uploadField = UploadField::create('GroupPhotos')
-        );
-        if (method_exists('SilverStripe\\Forms\\UploadField', 'setAllowedFileCategories')) {
-            $uploadField->setAllowedFileCategories('image');
-        }
-
+        $fields->addFieldToTab('Root.Main', $uploadField = UploadField::create('GroupPhotos'));
+        $uploadField->setAllowedFileCategories('image');
         return $fields;
     }
 
     public function validate()
     {
         if (!$this->Title) {
-            return new ValidationResult(false, 'Title is required');
+            $result = new ValidationResult();
+            $result->addError('Title is required');
+            return $result;
         } else {
             return parent::validate();
         }
@@ -98,15 +87,15 @@ public function DynamicProperty()
     {
         return sprintf('%s (%s)', $this->Name, $this->CEO);
     }
-    
+
     public function requireDefaultRecords()
     {
         parent::requireDefaultRecords();
-        $companySet = DataObject::get('SilverStripe\\FrameworkTest\\Model\\Company');
+        $companySet = static::get();
         foreach ($companySet as $company) {
             $company->delete();
         }
-        
+
         foreach ($this->data() as $companyData) {
             $company = new Company();
             $company->Name = $companyData[0];