diff --git a/accessibility.admin.inc b/accessibility.admin.inc
index aa2bd7b..a2fd24b 100644
--- a/accessibility.admin.inc
+++ b/accessibility.admin.inc
@@ -1,21 +1,6 @@
 <?php
 
 /**
- * Helper function to get enabled tests.
- */
-function _accessibility_admin_get_enabled_tests() {
-  static $tests;
-  if ($tests) {
-    return $tests;
-  }
-  $tests = db_select('accessibility_test', 'a')
-              ->fields('a', array('quail_name', 'name'))
-              ->execute()
-              ->fetchAllKeyed();
-  return $tests;
-}
-
-/**
  * Form for importing tests. 
  */
 function accessibility_tests_list() {
diff --git a/accessibility.features.inc b/accessibility.features.inc
new file mode 100644
index 0000000..1009c30
--- /dev/null
+++ b/accessibility.features.inc
@@ -0,0 +1,78 @@
+<?php
+
+
+/**
+ * Implements hook[component]_features_export().
+ */
+function accessibility_test_features_export($data, &$export, $module_name) {
+  if(!function_exists($module_name . 'accessibility_test_default')) {
+    module_load_include('inc', $module_name, $module_name .'.accessibility_test');
+  }
+  foreach ($data as $component) {
+    $export['features']['accessibility_test'][$component] = $component;
+  }
+  return array();
+}
+
+/**
+ * Implements hook[component]_features_export_options().
+ */
+function accessibility_test_features_export_options() {
+  $options = array();
+  $tests = _accessibility_admin_get_enabled_tests();
+  return $tests;
+}
+
+/**
+ * Implements hook[component]_features_export_render().
+ */
+function accessibility_test_features_export_render($module_name, $data, $export = NULL) {
+  if(!function_exists($module_name . 'accessibility_test_default')) {
+    module_load_include('inc', $module_name, $module_name .'.accessibility_test');
+  }
+  $code = array();
+  $code[] = '$accessibility_tests = array();';
+  foreach ($data as $name) {
+  	$id = accessibility_get_test_by_machine_name($name);
+  	$test = accessibility_test_load($id);
+  	unset($test->test_id);
+  	unset($test->created);
+  	unset($test->changed);
+  	unset($test->rdf_mapping);
+    $code[] = "\$accessibility_tests['{$name}'] = (object)" . features_var_export($test) .";";
+  }
+  $code[] = "return \$accessibility_tests;";
+  $code = implode("\n", $code);
+  return array('accessibility_test_default' => $code);
+}
+
+/**
+ * Implements hook[component]_features_revert().
+ */
+function accessibility_test_features_revert($module_name) {
+  accessibility_test_features_rebuild($module_name);
+}
+
+/**
+ * Implements hook[component]_features_rebuild().
+ */
+function accessibility_test_features_rebuild($module_name) {
+  if(!function_exists($module_name . 'accessibility_test_default')) {
+    module_load_include('inc', $module_name, $module_name .'.accessibility_test');
+  }
+  $accessibility_tests = module_invoke($module_name, 'accessibility_test_default');
+  if (!empty($accessibility_tests)) {
+    foreach ($accessibility_tests as $machine_name => $accessibility_test) {
+      $id = accessibility_get_test_by_machine_name($machine_name);
+      if($id && !$delete) {
+        $accessibility_test->test_id = $id;
+      }
+      if($delete) {
+        accessibility_test_delete_multiple(array($id));
+      }
+      $accessibility_test->changed = time();
+      $accessibility_test->created = time();
+      accessibility_test_save($accessibility_test);
+    }
+  }
+}
diff --git a/accessibility.module b/accessibility.module
index 564470e..1b2a672 100644
--- a/accessibility.module
+++ b/accessibility.module
@@ -120,6 +120,12 @@ function accessibility_entity_info() {
 class AccessibilityTestController extends EntityAPIController {
   
   public function save($test) {
+    if ((property_exists($test, 'is_new') && $test->is_new) || !isset($test->test_id)) {
+      $test->changed = $test->created = time();
+    }
+    else {
+      $test->changed = time();
+    }
     parent::save($test);
     if (property_exists($test, 'is_new') && $test->is_new) {
       drupal_write_record('accessibility_test', $test);
@@ -128,6 +134,8 @@ class AccessibilityTestController extends EntityAPIController {
       db_update('accessibility_test')
                ->fields(array('name' => $test->name,
                               'severity' => $test->severity,
+                              'created' => $test->created,
+                              'changed' => $test->changed,
                               'quail_name' => $test->quail_name))
                ->condition('test_id', $test->test_id)
                ->execute();
@@ -141,8 +149,8 @@ class AccessibilityTestController extends EntityAPIController {
       'test_id' => '',
       'is_new' => TRUE,
       'name' => '',
-      'created' => '',
-      'changed' => '',
+      'created' => time(),
+      'changed' => time(),
       'quail_name' => '',
       'severity' => '',
       'status' => 1,
@@ -650,6 +658,21 @@ function accessibility_views_api() {
 }
 
 /**
+ * Implements hook_features_api().
+ */
+function accessibility_features_api() {
+  return array(
+    'accessibility_test' => array(
+      'default_hook' => 'accessibility_test_default',
+      'default_file' => FEATURES_DEFAULTS_CUSTOM,
+      'feature_source' => TRUE,
+      'default_filename' => 'accessibility_test',
+      'file' => drupal_get_path('module', 'accessibility') . '/accessibility.features.inc',
+    ),
+  );
+}
+
+/**
  *  Helper function to return all active accessibiliy test entities.
  */
 function accessibility_get_active_tests($load = TRUE) {
@@ -665,4 +688,31 @@ function accessibility_get_active_tests($load = TRUE) {
   }
   return $tests;
                       
+}
+
+/**
+ * Helper function to get enabled tests.
+ */
+function _accessibility_admin_get_enabled_tests() {
+  static $tests;
+  if ($tests) {
+    return $tests;
+  }
+  $tests = db_select('accessibility_test', 'a')
+              ->fields('a', array('quail_name', 'name'))
+              ->execute()
+              ->fetchAllKeyed();
+  return $tests;
+}
+
+/**
+ * Returns the test ID for a given machine name.
+ */
+function accessibility_get_test_by_machine_name($name) {
+  $id = db_select('accessibility_test', 'a')
+          ->fields('a', array('test_id'))
+          ->condition('quail_name', $name)
+          ->execute()
+          ->fetchField();
+  return (int)$id;
 }
\ No newline at end of file
