diff --git a/src/Tests/TMGMTUiContinuousTest.php b/src/Tests/TMGMTUiContinuousTest.php
new file mode 100644
index 0000000..2b56348
--- /dev/null
+++ b/src/Tests/TMGMTUiContinuousTest.php
@@ -0,0 +1,210 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\tmgmt\Tests\TMGMTUiTest.
+ */
+
+namespace Drupal\tmgmt\Tests;
+
+use Drupal\tmgmt\Entity\Job;
+use Drupal\tmgmt\Entity\Translator;
+
+/**
+ * Verifies continuous functionality of the user interface
+ *
+ * @group tmgmt
+ */
+class TMGMTUiContinuousTest extends EntityTestBase {
+
+  public static $modules = ['tmgmt_content'];
+
+  /**
+   * {@inheritdoc}
+   */
+  function setUp() {
+    parent::setUp();
+
+    // Login as admin to be able to set environment variables.
+    $this->loginAsAdmin();
+    $this->addLanguage('de');
+    $this->addLanguage('es');
+
+    // Login as translator only with limited permissions to run these tests.
+    $this->loginAsTranslator(array(
+      'access administration pages',
+      'create translation jobs',
+      'submit translation jobs',
+    ), TRUE);
+    $this->drupalPlaceBlock('system_breadcrumb_block');
+
+    $this->createNodeType('page', 'Page', TRUE);
+    $this->createNodeType('article', 'Article', TRUE);
+  }
+
+  /**
+   * Tests of the job item review process.
+   */
+  public function testContinuous() {
+    // Test that continuous jobs are shown in the job overview.
+    $this->container->get('module_installer')->install(['tmgmt_file'], TRUE);
+    $non_continuous_translator = Translator::create([
+      'name' => strtolower($this->randomMachineName()),
+      'label' => $this->randomMachineName(),
+      'plugin' => 'file',
+      'remote_languages_mappings' => [],
+      'settings' => [],
+    ]);
+    $non_continuous_translator->save();
+
+    $continuous_job = $this->createJob('en', 'de', 0, [
+      'label' => 'Continuous job',
+      'job_type' => 'continuous',
+    ]);
+
+    $this->drupalGet('admin/tmgmt/jobs', ['query' => ['state' => '6']]);
+    $this->assertText($continuous_job->label(), 'Continuous job is displayed on job overview page with status filter on continuous jobs.');
+
+    $this->drupalGet('admin/tmgmt/jobs', ['query' => ['state' => 'in_progress']]);
+    $this->assertNoText($continuous_job->label(), 'Continuous job is not displayed on job overview page if status filter is on in progress jobs.');
+
+    // Test that there are source items checkboxes on a continuous job form.
+    $this->drupalGet('admin/tmgmt/jobs/' . $continuous_job->id());
+    $this->assertText($continuous_job->label());
+    $this->assertNoFieldChecked('edit-continuous-settings-content-node-enabled', 'There is content checkbox and it is not checked yet.');
+    $this->assertNoFieldChecked('edit-continuous-settings-content-node-bundles-article', 'There is article checkbox and it is not checked yet.');
+    $this->assertNoFieldChecked('edit-continuous-settings-content-node-bundles-page', 'There is page checkbox and it is not checked yet.');
+
+    // Enable Article source item for continuous job.
+    $edit_continuous_job = [
+      'continuous_settings[content][node][enabled]' => TRUE,
+      'continuous_settings[content][node][bundles][article]' => TRUE,
+    ];
+    $this->drupalPostForm(NULL, $edit_continuous_job, t('Save job'));
+
+    // Test that continuous settings configuration is saved correctly.
+    $updated_continuous_job = Job::load($continuous_job->id());
+    $job_continuous_settings = $updated_continuous_job->getContinuousSettings();
+    $this->assertEqual($job_continuous_settings['content']['node']['enabled'], 1, 'Continuous settings configuration for node is saved correctly.');
+    $this->assertEqual($job_continuous_settings['content']['node']['bundles']['article'], 1, 'Continuous settings configuration for article is saved correctly.');
+    $this->assertEqual($job_continuous_settings['content']['node']['bundles']['page'], 0, 'Continuous settings configuration for page is saved correctly.');
+
+    // Test that continuous settings checkboxes are checked correctly.
+    $this->clickLink('Manage');
+    $this->assertText($continuous_job->label());
+    $this->assertFieldChecked('edit-continuous-settings-content-node-enabled', 'Content checkbox is now checked.');
+    $this->assertFieldChecked('edit-continuous-settings-content-node-bundles-article', 'Article checkbox now checked.');
+    $this->assertNoFieldChecked('edit-continuous-settings-content-node-bundles-page', 'Page checkbox is not checked.');
+
+    // Create continuous job through the form.
+    $this->loginAsTranslator([
+      'access administration pages',
+      'create translation jobs',
+      'submit translation jobs',
+    ], TRUE);
+    $this->drupalGet('admin/tmgmt/continuous_jobs/continuous_add');
+    $this->assertNoText($non_continuous_translator->label());
+    $continuous_job_label = strtolower($this->randomMachineName());
+    $edit_job = [
+      'label[0][value]' => $continuous_job_label,
+      'target_language' => 'de',
+      'translator' => $this->default_translator->id(),
+    ];
+    $this->drupalPostForm(NULL, $edit_job, t('Save job'));
+    $this->assertText($continuous_job_label, 'Continuous job was created.');
+
+    // Test that previous created job is continuous job.
+    $this->drupalGet('admin/tmgmt/jobs');
+    $this->assertText($continuous_job_label, 'Created continuous job is displayed on job overview page.');
+    // Test that job overview page with status to continuous does not have
+    // Submit link.
+    $this->drupalGet('admin/tmgmt/jobs', ['query' => ['state' => Job::STATE_CONTINUOUS]]);
+    $this->assertNoLink('Submit', 'There is no Submit link on job overview with status to continuous.');
+
+    // Test that all unnecessary fields and buttons do not exist on continuous
+    // job edit form.
+    $this->clickLink('Manage', 1);
+    $this->assertNoRaw('<label for="edit-translator">Provider</label>', 'There is no Provider info field on continuous job edit form.');
+    $this->assertNoRaw('<label for="edit-word-count">Total word count</label>', 'There is no Total word count info field on continuous job edit form.');
+    $this->assertNoRaw('<label for="edit-tags-count">Total HTML tags count</label>', 'There is no Total HTML tags count info field on continuous job edit form.');
+    $this->assertNoRaw('<label for="edit-created">Created</label>', 'There is no Created info field on continuous job edit form.');
+    $this->assertNoRaw('id="edit-job-items-wrapper"', 'There is no Job items field on continuous job edit form.');
+    $this->assertNoRaw('<div class="tmgmt-color-legend clearfix">', 'There is no Item state legend on continuous job edit form.');
+    $this->assertNoRaw('id="edit-messages"', 'There is no Translation Job Messages field on continuous job edit form.');
+    $this->assertNoFieldById('edit-abort-job', NULL, 'There is no Abort job button.');
+    $this->assertNoFieldById('edit-submit', NULL, 'There is no Submit button.');
+    $this->assertNoFieldById('edit-resubmit-job', NULL, 'There is Resubmit job button.');
+
+    // Remove continuous jobs and assert there is no filter displayed.
+    $this->loginAsAdmin();
+    $continuous_job->delete();
+    $this->drupalGet('admin/tmgmt/jobs');
+    $this->clickLink(t('Delete'));
+    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalGet('admin/tmgmt/job_items');
+    $this->assertNoText(t('Job type'));
+    $this->assertNoFieldByName('job_type');
+
+    // Test that the empty text is displayed.
+    $this->drupalGet('admin/tmgmt/job_items', array('query' => array('state' => 5)));
+    $this->assertText(t('No job items for the current selection.'));
+  }
+
+  /**
+   * Test continuous job form improvements.
+   */
+  public function testContinuousJobForm() {
+    // Create two new node types one not enabled for translation.
+    $this->createNodeType('page1', 'Enabled page', TRUE);
+    $this->createNodeType('article1', 'Not enabled article', FALSE);
+    // Create continuous job through the form.
+    $this->drupalGet('admin/tmgmt/continuous_jobs/continuous_add');
+    // Test we don't have selected source language in target language dropdown.
+    $this->drupalPostAjaxForm(NULL, ['source_language' => 'de'], 'source_language');
+    $option1 = $this->xpath('//*[@id="edit-target-language"]/option[1]');
+    $option2 = $this->xpath('//*[@id="edit-target-language"]/option[2]');
+    $option3 =$this->xpath('//*[@id="edit-target-language"]/option[3]');
+    $this->assertNotEqual('German', $option1);
+    $this->assertNotEqual('German', $option2);
+    $this->assertNotEqual('German', $option3);
+
+    $continuous_job_label = strtolower($this->randomMachineName());
+    $edit_job = [
+      'label[0][value]' => $continuous_job_label,
+      'target_language' => 'es',
+      'continuous_settings[content][node][enabled]' => TRUE,
+    ];
+
+    $this->drupalPostForm(NULL, $edit_job, t('Save job'));
+    // Check we don't see not enabled article in content type list.
+    $this->clickLink('Manage');
+    $this->assertText(t('Enabled page'));
+    $this->assertNoText(t('Not enabled article'));
+  }
+
+  /**
+   * Tests access to add continuous job link.
+   */
+  public function testAddContinuousLink() {
+    $this->drupalLogin($this->createUser(['administer tmgmt']));
+    $this->drupalGet('admin/tmgmt/jobs');
+    $this->assertResponse(200);
+    $this->assertNoText('Add continuous job', 'Link is not displayed if user doesn\'t have permission.');
+    $this->drupalLogin($this->createUser([
+      'administer tmgmt',
+      'create translation jobs',
+    ]));
+    $this->drupalGet('admin/tmgmt/jobs');
+    $this->assertText('Add continuous job', 'User has access to link with the right permission.');
+    \Drupal::service('module_installer')->uninstall(['tmgmt_test']);
+    $this->drupalGet('admin/tmgmt/jobs');
+    $this->assertNoText('Add continuous job', 'Link is not showing if there is no continuous translator.');
+    // The 'Add continuous job' is currently not showing up without clearing the
+    // cache after we add a continuous translator.
+    // @see https://www.drupal.org/node/2685445
+    // \Drupal::service('module_installer')->install(['tmgmt_test']);
+    // $this->drupalGet('admin/tmgmt/jobs');
+    // $this->assertText('Add continuous job', 'Link is showing if there is a continuous translator.');
+  }
+
+}
diff --git a/src/Tests/TMGMTUiTest.php b/src/Tests/TMGMTUiTest.php
index 39a8932..d3bf55f 100644
--- a/src/Tests/TMGMTUiTest.php
+++ b/src/Tests/TMGMTUiTest.php
@@ -11,7 +11,6 @@ use Drupal\tmgmt\Entity\Job;
 use Drupal\tmgmt\Entity\JobItem;
 use Drupal\tmgmt\Entity\Translator;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\tmgmt\Tests\EntityTestBase;
 
 /**
  * Verifies basic functionality of the user interface
@@ -20,8 +19,6 @@ use Drupal\tmgmt\Tests\EntityTestBase;
  */
 class TMGMTUiTest extends EntityTestBase {
 
-  public static $modules = ['ckeditor', 'tmgmt_content'];
-
   /**
    * {@inheritdoc}
    */
@@ -34,8 +31,6 @@ class TMGMTUiTest extends EntityTestBase {
     ));
     $filtered_html_format->save();
 
-    // Login as admin to be able to set environment variables.
-    $this->loginAsAdmin();
     $this->addLanguage('de');
     $this->addLanguage('es');
     $this->addLanguage('el');
@@ -713,7 +708,7 @@ class TMGMTUiTest extends EntityTestBase {
 
     // Test validation message for 'Validate' button.
     $this->drupalGet('admin/tmgmt/items/' . $item->id());
-    $translation_field = $this->randomString();
+    $translation_field = $this->randomMachineName();
     $edit = array(
       'dummy|deep_nesting[translation]' => $translation_field,
     );
@@ -724,95 +719,6 @@ class TMGMTUiTest extends EntityTestBase {
     $this->drupalPostForm(NULL, $edit, t('Validate HTML tags'));
     $this->assertText(t('Validation completed successfully.'), 'Message is correctly displayed.');
 
-    // Test that continuous jobs are shown in the job overview.
-    $this->container->get('module_installer')->install(['tmgmt_file'], TRUE);
-    $non_continuous_translator = Translator::create([
-      'name' => strtolower($this->randomMachineName()),
-      'label' => $this->randomMachineName(),
-      'plugin' => 'file',
-      'remote_languages_mappings' => [],
-      'settings' => [],
-    ]);
-    $non_continuous_translator->save();
-
-    $continuous_job = $this->createJob('en', 'de', 0, [
-      'label' => 'Continuous job',
-      'job_type' => 'continuous',
-    ]);
-
-    $this->drupalGet('admin/tmgmt/jobs', ['query' => ['state' => '6']]);
-    $this->assertText($continuous_job->label(), 'Continuous job is displayed on job overview page with status filter on continuous jobs.');
-
-    $this->drupalGet('admin/tmgmt/jobs', ['query' => ['state' => 'in_progress']]);
-    $this->assertNoText($continuous_job->label(), 'Continuous job is not displayed on job overview page if status filter is on in progress jobs.');
-
-    // Test that there are source items checkboxes on a continuous job form.
-    $this->drupalGet('admin/tmgmt/jobs/' . $continuous_job->id());
-    $this->assertText($continuous_job->label());
-    $this->assertNoFieldChecked('edit-continuous-settings-content-node-enabled', 'There is content checkbox and it is not checked yet.');
-    $this->assertNoFieldChecked('edit-continuous-settings-content-node-bundles-article', 'There is article checkbox and it is not checked yet.');
-    $this->assertNoFieldChecked('edit-continuous-settings-content-node-bundles-page', 'There is page checkbox and it is not checked yet.');
-
-    // Enable Article source item for continuous job.
-    $edit_continuous_job = [
-      'continuous_settings[content][node][enabled]' => TRUE,
-      'continuous_settings[content][node][bundles][article]' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit_continuous_job, t('Save job'));
-
-    // Test that continuous settings configuration is saved correctly.
-    $updated_continuous_job = Job::load($continuous_job->id());
-    $job_continuous_settings = $updated_continuous_job->getContinuousSettings();
-    $this->assertEqual($job_continuous_settings['content']['node']['enabled'], 1, 'Continuous settings configuration for node is saved correctly.');
-    $this->assertEqual($job_continuous_settings['content']['node']['bundles']['article'], 1, 'Continuous settings configuration for article is saved correctly.');
-    $this->assertEqual($job_continuous_settings['content']['node']['bundles']['page'], 0, 'Continuous settings configuration for page is saved correctly.');
-
-    // Test that continuous settings checkboxes are checked correctly.
-    $this->clickLink('Manage');
-    $this->assertText($continuous_job->label());
-    $this->assertFieldChecked('edit-continuous-settings-content-node-enabled', 'Content checkbox is now checked.');
-    $this->assertFieldChecked('edit-continuous-settings-content-node-bundles-article', 'Article checkbox now checked.');
-    $this->assertNoFieldChecked('edit-continuous-settings-content-node-bundles-page', 'Page checkbox is not checked.');
-
-    // Create continuous job through the form.
-    $this->loginAsTranslator([
-      'access administration pages',
-      'create translation jobs',
-      'submit translation jobs',
-    ], TRUE);
-    $this->drupalGet('admin/tmgmt/continuous_jobs/continuous_add');
-    $this->assertNoText($non_continuous_translator->label());
-    $continuous_job_label = strtolower($this->randomMachineName());
-    $edit_job = [
-      'label[0][value]' => $continuous_job_label,
-      'target_language' => 'de',
-      'translator' => $this->default_translator->id(),
-    ];
-    $this->drupalPostForm(NULL, $edit_job, t('Save job'));
-    $this->assertText($continuous_job_label, 'Continuous job was created.');
-
-    // Test that previous created job is continuous job.
-    $this->drupalGet('admin/tmgmt/jobs');
-    $this->assertText($continuous_job_label, 'Created continuous job is displayed on job overview page.');
-    // Test that job overview page with status to continuous does not have
-    // Submit link.
-    $this->drupalGet('admin/tmgmt/jobs', ['query' => ['state' => Job::STATE_CONTINUOUS]]);
-    $this->assertNoLink('Submit', 'There is no Submit link on job overview with status to continuous.');
-
-    // Test that all unnecessary fields and buttons do not exist on continuous
-    // job edit form.
-    $this->clickLink('Manage', 1);
-    $this->assertNoRaw('<label for="edit-translator">Provider</label>', 'There is no Provider info field on continuous job edit form.');
-    $this->assertNoRaw('<label for="edit-word-count">Total word count</label>', 'There is no Total word count info field on continuous job edit form.');
-    $this->assertNoRaw('<label for="edit-tags-count">Total HTML tags count</label>', 'There is no Total HTML tags count info field on continuous job edit form.');
-    $this->assertNoRaw('<label for="edit-created">Created</label>', 'There is no Created info field on continuous job edit form.');
-    $this->assertNoRaw('id="edit-job-items-wrapper"', 'There is no Job items field on continuous job edit form.');
-    $this->assertNoRaw('<div class="tmgmt-color-legend clearfix">', 'There is no Item state legend on continuous job edit form.');
-    $this->assertNoRaw('id="edit-messages"', 'There is no Translation Job Messages field on continuous job edit form.');
-    $this->assertNoFieldById('edit-abort-job', NULL, 'There is no Abort job button.');
-    $this->assertNoFieldById('edit-submit', NULL, 'There is no Submit button.');
-    $this->assertNoFieldById('edit-resubmit-job', NULL, 'There is Resubmit job button.');
-
     // Test that normal job item are shown in job items overview.
     $this->drupalGet('admin/tmgmt/job_items', array('query' => array('state' => 'All')));
     $this->assertNoText($job1->label(), 'Normal job item is displayed on job items overview.');
@@ -823,24 +729,6 @@ class TMGMTUiTest extends EntityTestBase {
     // Test that progress bar is being displayed.
     $this->assertRaw('class="tmgmt-progress-pending" style="width: 50%"');
     $this->assertRaw('class="tmgmt-progress-translated" style="width: 100%"');
-
-    // Test the job type filter.
-    $this->drupalGet('admin/tmgmt/job_items', array('query' => array('job_type' => 2)));
-    $this->assertEqual(count($this->xpath('//tbody/tr')), 0);
-
-    // Remove continuous jobs and assert there is no filter displayed.
-    $this->loginAsAdmin();
-    $continuous_job->delete();
-    $this->drupalGet('admin/tmgmt/jobs');
-    $this->clickLink(t('Delete'));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->drupalGet('admin/tmgmt/job_items');
-    $this->assertNoText(t('Job type'));
-    $this->assertNoFieldByName('job_type');
-
-    // Test that the empty text is displayed.
-    $this->drupalGet('admin/tmgmt/job_items', array('query' => array('state' => 5)));
-    $this->assertText(t('No job items for the current selection.'));
   }
 
   /**
@@ -973,7 +861,7 @@ class TMGMTUiTest extends EntityTestBase {
       $this->assertEqual($_item->getCountReviewed(), 0);
     }
 
-    $this->drupalLogin($this->admin_user);
+    $this->loginAsAdmin();
     // Navigate back to the aborted job and check for the log message.
     $this->drupalGet('admin/tmgmt/jobs/' . $job->id());
 
@@ -1189,7 +1077,7 @@ class TMGMTUiTest extends EntityTestBase {
     $this->clickLink(t('Jobs'));
     $this->assertTitle(t('Job overview | Drupal'));
     $this->clickLink(t('Sources'));
-    $this->assertTitle(t('Content overview (Content Entity) | Drupal'));
+    $this->assertTitle(t('Translation Sources | Drupal'));
   }
 
   /**
@@ -1522,61 +1410,4 @@ class TMGMTUiTest extends EntityTestBase {
     $this->assertEqual($result->div['title'], $title);
   }
 
-  /**
-   * Test continuous job form improvements.
-   */
-  public function testContinuousJobForm() {
-    // Create two new node types one not enabled for translation.
-    $this->createNodeType('page1', 'Enabled page', TRUE);
-    $this->createNodeType('article1', 'Not enabled article', FALSE);
-    // Create continuous job through the form.
-    $this->drupalGet('admin/tmgmt/continuous_jobs/continuous_add');
-    // Test we don't have selected source language in target language dropdown.
-    $this->drupalPostAjaxForm(NULL, ['source_language' => 'de'], 'source_language');
-    $option1 = $this->xpath('//*[@id="edit-target-language"]/option[1]');
-    $option2 = $this->xpath('//*[@id="edit-target-language"]/option[2]');
-    $option3 =$this->xpath('//*[@id="edit-target-language"]/option[3]');
-    $this->assertNotEqual('German', $option1);
-    $this->assertNotEqual('German', $option2);
-    $this->assertNotEqual('German', $option3);
-
-    $continuous_job_label = strtolower($this->randomMachineName());
-    $edit_job = [
-      'label[0][value]' => $continuous_job_label,
-      'target_language' => 'es',
-      'continuous_settings[content][node][enabled]' => TRUE,
-    ];
-
-    $this->drupalPostForm(NULL, $edit_job, t('Save job'));
-    // Check we don't see not enabled article in content type list.
-    $this->clickLink('Manage');
-    $this->assertText(t('Enabled page'));
-    $this->assertNoText(t('Not enabled article'));
-  }
-
-  /**
-   * Tests access to add continuous job link.
-   */
-  public function testAddContinuousLink() {
-    $this->drupalLogin($this->createUser(['administer tmgmt']));
-    $this->drupalGet('admin/tmgmt/jobs');
-    $this->assertResponse(200);
-    $this->assertNoText('Add continuous job', 'Link is not displayed if user doesn\'t have permission.');
-    $this->drupalLogin($this->createUser([
-      'administer tmgmt',
-      'create translation jobs',
-    ]));
-    $this->drupalGet('admin/tmgmt/jobs');
-    $this->assertText('Add continuous job', 'User has access to link with the right permission.');
-    \Drupal::service('module_installer')->uninstall(['tmgmt_test']);
-    $this->drupalGet('admin/tmgmt/jobs');
-    $this->assertNoText('Add continuous job', 'Link is not showing if there is no continuous translator.');
-    // The 'Add continuous job' is currently not showing up without clearing the
-    // cache after we add a continuous translator.
-    // @see https://www.drupal.org/node/2685445
-    // \Drupal::service('module_installer')->install(['tmgmt_test']);
-    // $this->drupalGet('admin/tmgmt/jobs');
-    // $this->assertText('Add continuous job', 'Link is showing if there is a continuous translator.');
-  }
-
 }