diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
index 11ab663..13d0fba 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
@@ -8,12 +8,11 @@
 namespace Drupal\options\Tests;
 
 use Drupal\field\FieldException;
-use Drupal\field\Tests\FieldUnitTestBase;
 
 /**
  * Tests for the 'Options' field types.
  */
-class OptionsFieldTest extends FieldUnitTestBase {
+class OptionsFieldTest extends OptionsFieldUnitTestBase {
 
   /**
    * Modules to enable.
@@ -30,33 +29,6 @@ public static function getInfo() {
     );
   }
 
-  function setUp() {
-    parent::setUp();
-    $this->installSchema('system', 'menu_router');
-
-
-    $this->field_name = 'test_options';
-    $this->field_definition = array(
-      'field_name' => $this->field_name,
-      'type' => 'list_integer',
-      'cardinality' => 1,
-      'settings' => array(
-        'allowed_values' => array(1 => 'One', 2 => 'Two', 3 => 'Three'),
-      ),
-    );
-    $this->field = field_create_field($this->field_definition);
-
-    $this->instance = array(
-      'field_name' => $this->field_name,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-      'widget' => array(
-        'type' => 'options_buttons',
-      ),
-    );
-    $this->instance = field_create_instance($this->instance);
-  }
-
   /**
    * Test that allowed values can be updated.
    */
@@ -66,14 +38,14 @@ function testUpdateAllowedValues() {
     // All three options appear.
     $entity = entity_create('entity_test', array());
     $form = entity_get_form($entity);
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][1]), 'Option 1 exists');
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][2]), 'Option 2 exists');
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][3]), 'Option 3 exists');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][1]), 'Option 1 exists');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][2]), 'Option 2 exists');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][3]), 'Option 3 exists');
 
     // Use one of the values in an actual entity, and check that this value
     // cannot be removed from the list.
     $entity = entity_create('entity_test', array());
-    $entity->{$this->field_name}->value = 1;
+    $entity->{$this->fieldName}->value = 1;
     $entity->save();
     $this->field['settings']['allowed_values'] = array(2 => 'Two');
     try {
@@ -84,7 +56,7 @@ function testUpdateAllowedValues() {
       $this->pass(t('Cannot update a list field to not include keys with existing data.'));
     }
     // Empty the value, so that we can actually remove the option.
-    unset($entity->{$this->field_name});
+    unset($entity->{$this->fieldName});
     $entity->save();
 
     // Removed options do not appear.
@@ -92,26 +64,26 @@ function testUpdateAllowedValues() {
     field_update_field($this->field);
     $entity = entity_create('entity_test', array());
     $form = entity_get_form($entity);
-    $this->assertTrue(empty($form[$this->field_name][$langcode][1]), 'Option 1 does not exist');
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][2]), 'Option 2 exists');
-    $this->assertTrue(empty($form[$this->field_name][$langcode][3]), 'Option 3 does not exist');
+    $this->assertTrue(empty($form[$this->fieldName][$langcode][1]), 'Option 1 does not exist');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][2]), 'Option 2 exists');
+    $this->assertTrue(empty($form[$this->fieldName][$langcode][3]), 'Option 3 does not exist');
 
     // Completely new options appear.
     $this->field['settings']['allowed_values'] = array(10 => 'Update', 20 => 'Twenty');
     field_update_field($this->field);
     $form = entity_get_form($entity);
-    $this->assertTrue(empty($form[$this->field_name][$langcode][1]), 'Option 1 does not exist');
-    $this->assertTrue(empty($form[$this->field_name][$langcode][2]), 'Option 2 does not exist');
-    $this->assertTrue(empty($form[$this->field_name][$langcode][3]), 'Option 3 does not exist');
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][10]), 'Option 10 exists');
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][20]), 'Option 20 exists');
+    $this->assertTrue(empty($form[$this->fieldName][$langcode][1]), 'Option 1 does not exist');
+    $this->assertTrue(empty($form[$this->fieldName][$langcode][2]), 'Option 2 does not exist');
+    $this->assertTrue(empty($form[$this->fieldName][$langcode][3]), 'Option 3 does not exist');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][10]), 'Option 10 exists');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][20]), 'Option 20 exists');
 
     // Options are reset when a new field with the same name is created.
-    field_delete_field($this->field_name);
+    field_delete_field($this->fieldName);
     unset($this->field['id']);
-    field_create_field($this->field_definition);
+    field_create_field($this->fieldDefinition);
     $this->instance = array(
-      'field_name' => $this->field_name,
+      'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'widget' => array(
@@ -121,8 +93,8 @@ function testUpdateAllowedValues() {
     field_create_instance($this->instance);
     $entity = entity_create('entity_test', array());
     $form = entity_get_form($entity);
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][1]), 'Option 1 exists');
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][2]), 'Option 2 exists');
-    $this->assertTrue(!empty($form[$this->field_name][$langcode][3]), 'Option 3 exists');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][1]), 'Option 1 exists');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][2]), 'Option 2 exists');
+    $this->assertTrue(!empty($form[$this->fieldName][$langcode][3]), 'Option 3 exists');
   }
 }
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php
new file mode 100644
index 0000000..e2d4ad7
--- /dev/null
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\options\Tests\OptionsFieldUnitTestBase.
+ */
+
+
+namespace Drupal\options\Tests;
+
+use Drupal\field\Tests\FieldUnitTestBase;
+
+/**
+ * Defines a common base test class for unit tests of the options module.
+ */
+class OptionsFieldUnitTestBase extends FieldUnitTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('options');
+
+  /**
+   * The field name used in the test.
+   *
+   * @var string
+   */
+  protected $fieldName = 'test_options';
+
+  /**
+   * The field definition used to created the field entity.
+   *
+   * @var array
+   */
+  protected $fieldDefinition;
+
+  /**
+   * The list field used in the test.
+   *
+   * @var \Drupal\field\Plugin\Core\Entity\Field
+   */
+  protected $field;
+
+  /**
+   * The list field instance used in the test.
+   *
+   * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
+   */
+  protected $instance;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+    $this->installSchema('system', 'menu_router');
+
+    $this->fieldDefinition = array(
+      'field_name' => $this->fieldName,
+      'type' => 'list_integer',
+      'cardinality' => 1,
+      'settings' => array(
+        'allowed_values' => array(1 => 'One', 2 => 'Two', 3 => 'Three'),
+      ),
+    );
+    $this->field = entity_create('field_entity', $this->fieldDefinition);
+    $this->field->save();
+
+    $instance = array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'widget' => array(
+        'type' => 'options_buttons',
+      ),
+    );
+    $this->instance = entity_create('field_instance', $instance);
+    $this->instance->save();
+  }
+
+}
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFormattersTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFormattersTest.php
new file mode 100644
index 0000000..ea1c6c4
--- /dev/null
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFormattersTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\options\Tests\OptionsFormattersTest.
+ */
+
+namespace Drupal\options\Tests;
+
+/**
+ * Tests the formatters provided by the options module.
+ *
+ * @see \Drupal\options\Plugin\field\formatter\OptionsDefaultFormatter
+ * @see \Drupal\options\Plugin\field\formatter\OptionsKeyFormatter
+ */
+class OptionsFormattersTest extends OptionsFieldUnitTestBase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Options field formatters',
+      'description' => 'Test the Options field type formatters.',
+      'group' => 'Field types',
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * Tests the formatters.
+   */
+  public function testFormatter() {
+    $entity = entity_create('entity_test', array());
+    $entity->{$this->fieldName}->value = 1;
+
+    debug(field_view_field($entity, $this->fieldName, array()));
+  }
+
+
+}
diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index 1062f7f..66a6492 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -44,7 +44,7 @@ function options_field_info() {
       'description' => t("This field stores integer values from a list of allowed 'value => label' pairs, i.e. 'Lifetime in days': 1 => 1 day, 7 => 1 week, 31 => 1 month."),
       'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''),
       'default_widget' => 'options_select',
-      'default_formatter' => 'list_default',
+      'default_formatter' => 'options_list_default',
       'field item class' => '\Drupal\number\Type\IntegerItem',
     ),
     'list_float' => array(
@@ -52,7 +52,7 @@ function options_field_info() {
       'description' => t("This field stores float values from a list of allowed 'value => label' pairs, i.e. 'Fraction': 0 => 0, .25 => 1/4, .75 => 3/4, 1 => 1."),
       'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''),
       'default_widget' => 'options_select',
-      'default_formatter' => 'list_default',
+      'default_formatter' => 'options_list_default',
       'field item class' => '\Drupal\number\Type\FloatItem',
     ),
     'list_text' => array(
@@ -60,7 +60,7 @@ function options_field_info() {
       'description' => t("This field stores text values from a list of allowed 'value => label' pairs, i.e. 'US States': IL => Illinois, IA => Iowa, IN => Indiana."),
       'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''),
       'default_widget' => 'options_select',
-      'default_formatter' => 'list_default',
+      'default_formatter' => 'options_list_default',
       'field item class' => '\Drupal\text\Type\TextItem',
     ),
     'list_boolean' => array(
@@ -68,7 +68,7 @@ function options_field_info() {
       'description' => t('This field stores simple on/off or yes/no options.'),
       'settings' => array('allowed_values' => array(), 'allowed_values_function' => ''),
       'default_widget' => 'options_buttons',
-      'default_formatter' => 'list_default',
+      'default_formatter' => 'options_list_default',
       'field item class' => '\Drupal\number\Type\IntegerItem',
     ),
   );