diff --git a/demo/tmgmt_demo.info b/demo/tmgmt_demo.info
new file mode 100644
index 0000000..27d1f21
--- /dev/null
+++ b/demo/tmgmt_demo.info
@@ -0,0 +1,9 @@
+name = Translation Management Demo
+description = All elements for a functioning demo.
+package = Translation Management
+core = 7.x
+
+dependencies[] = tmgmt_ui
+dependencies[] = tmgmt_node_ui
+dependencies[] = tmgmt_file
+dependencies[] = tmgmt_local
diff --git a/demo/tmgmt_demo.install b/demo/tmgmt_demo.install
new file mode 100644
index 0000000..d18eea9
--- /dev/null
+++ b/demo/tmgmt_demo.install
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @file
+ * Installation hooks for tmgmt_demo module.
+ */
+
+
+/**
+ * Implements hook_install().
+ */
+function tmgmt_demo_install() {
+  include_once DRUPAL_ROOT . '/includes/locale.inc';
+  // Add German to the language list.
+  if (!in_array('de', language_list())) {
+    locale_add_language('de');
+  }
+
+  // Add content type 'translatable'.
+  if (!array_key_exists('translatable', node_type_get_names())) {
+    $type = array(
+      'type' => 'translatable',
+      'name' => 'Translation Demo Type',
+      'base' => 'node_content',
+      'custom' => 1,
+      'modified' => 1,
+      'locked' => 0,
+    );
+
+    $type = node_type_set_defaults($type);
+    node_type_save($type);
+    node_add_body_field($type);
+    variable_set('language_content_type_translatable', TRUE);
+    variable_set('comment_translatable', '0');
+  }
+
+  // Add language skills to the admin user.
+  $user = user_load(1);
+
+  $user->tmgmt_translation_skills[LANGUAGE_NONE][] = array(
+    'language_from' => 'de',
+    'language_to'   => 'en',
+  );
+  $user->tmgmt_translation_skills[LANGUAGE_NONE][] = array(
+    'language_from' => 'en',
+    'language_to'   => 'de',
+  );
+  user_save($user, (array) $user);
+
+  // Add demo content.
+  $node = new stdClass();
+  $node->title = 'Second node';
+  $node->type = 'translatable';
+  node_object_prepare($node);
+  $node->language = 'en';
+  $node->body[LANGUAGE_NONE][0]['value'] = 'Have another try. This text can be
+    translated as well';
+  $node->uid = $user->uid;
+  node_save($node);
+
+  $node = new stdClass();
+  $node->title = 'First node';
+  $node->type = 'translatable';
+  node_object_prepare($node);
+  $node->language = 'en';
+  $node->body[LANGUAGE_NONE][0]['value'] = 'This text can be translated with TMGMT.
+    Use the "translate" Tab and choose "Request Translation" to get started';
+  $node->uid = $user->uid;
+  node_save($node);
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function tmgmt_demo_uninstall() {
+  // Remove the content type created by the demo module.
+  if (array_key_exists('translatable', node_type_get_names())) {
+    node_type_delete('translatable');
+    variable_del('node_preview_translatable');
+    node_types_rebuild();
+    menu_rebuild();
+  }
+}
diff --git a/demo/tmgmt_demo.module b/demo/tmgmt_demo.module
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/demo/tmgmt_demo.module
@@ -0,0 +1 @@
+<?php
diff --git a/tmgmt.info b/tmgmt.info
index 8fafd9b..042d0c3 100644
--- a/tmgmt.info
+++ b/tmgmt.info
@@ -6,6 +6,7 @@ core = 7.x
 dependencies[] = entity
 dependencies[] = locale
 dependencies[] = views
+simplytest_dependencies[] = tmgmt_demo
 
 files[] = includes/tmgmt.exception.inc
 files[] = controller/tmgmt.controller.job.inc
diff --git a/ui/tmgmt_ui.test b/ui/tmgmt_ui.test
index e69ccb3..ce0e102 100644
--- a/ui/tmgmt_ui.test
+++ b/ui/tmgmt_ui.test
@@ -442,8 +442,8 @@ class TMGMTUITestCase extends TMGMTBaseTestCase {
       array('@url' => url('admin/tmgmt/jobs/' . $resubmitted_job->tjid), '@id' => $resubmitted_job->tjid)));
 
     $this->drupalGet('admin/tmgmt/jobs');
-    $elements = $this->xpath('//table[contains(@class, @view)]//tr[contains(@class, @row)]//td[contains(@class, @field)]',
-      array('@view' => 'views-table', '@row' => 'views-row-last', '@field' => 'views-field-progress'));
+    $elements = $this->xpath('//table[contains(@class, @view)]//td[contains(., @text)]',
+      array('@view' => 'views-table', '@text' => t('N/A')));
     $status = $elements[0];
     $this->assertEqual(trim((string)$status), t('N/A'));