diff --git a/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml b/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml
index 5c6e329..cf20d6f 100644
--- a/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml
+++ b/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml
@@ -3,8 +3,6 @@ status: true
 dependencies:
   module:
     - simplenews
-  theme:
-    - bartik
 id: simplenewssubscription
 theme: bartik
 region: sidebar_first
@@ -18,9 +16,8 @@ settings:
   label_display: visible
   cache:
     max_age: 0
-    contexts: {  }
   newsletters:
-    default: default
+    default: 'default'
   message: 'Stay informed - subscribe to our newsletter.'
   unique_id: dbbcae7b-bb10-4cf8-8c3d-61e4990109b5
 visibility: {  }
diff --git a/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml b/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml
index ffc1423..3a4ca4d 100644
--- a/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml
+++ b/modules/simplenews_demo/config/install/block.block.simplenewssubscription_all.yml
@@ -3,8 +3,6 @@ status: true
 dependencies:
   module:
     - simplenews
-  theme:
-    - bartik
 id: simplenewssubscription_all
 theme: bartik
 region: sidebar_first
@@ -18,7 +16,6 @@ settings:
   label_display: visible
   cache:
     max_age: 0
-    contexts: {  }
   newsletters:
     weekly_content_update: weekly_content_update
     special_offers: special_offers
diff --git a/modules/simplenews_demo/config/install/simplenews.newsletter.press_releases.yml b/modules/simplenews_demo/config/install/simplenews.newsletter.press_releases.yml
index 9584d31..8a9f037 100644
--- a/modules/simplenews_demo/config/install/simplenews.newsletter.press_releases.yml
+++ b/modules/simplenews_demo/config/install/simplenews.newsletter.press_releases.yml
@@ -3,11 +3,11 @@ name: 'Press releases'
 description: 'This is the press release.'
 format: plain
 priority: 0
-receipt: 0
+receipt: false
 from_name: ''
 subject: '[[simplenews-newsletter:name]] [node:title]'
 from_address: 'replace@example.org'
-hyperlinks: 1
+hyperlinks: true
 new_account: none
 opt_inout: double
 weight: 0
diff --git a/modules/simplenews_demo/config/install/simplenews.newsletter.special_offers.yml b/modules/simplenews_demo/config/install/simplenews.newsletter.special_offers.yml
index f05e7b4..b51fcd8 100644
--- a/modules/simplenews_demo/config/install/simplenews.newsletter.special_offers.yml
+++ b/modules/simplenews_demo/config/install/simplenews.newsletter.special_offers.yml
@@ -3,11 +3,11 @@ name: 'Special offers'
 description: 'Special offers newsletter.'
 format: plain
 priority: 0
-receipt: 0
+receipt: false
 from_name: ''
 subject: '[[simplenews-newsletter:name]] [node:title]'
 from_address: 'replace@example.org'
-hyperlinks: 1
+hyperlinks: true
 new_account: none
 opt_inout: double
 weight: 0
diff --git a/modules/simplenews_demo/config/install/simplenews.newsletter.weekly_content.yml b/modules/simplenews_demo/config/install/simplenews.newsletter.weekly_content.yml
index 8f07cb2..e0c6f7e 100644
--- a/modules/simplenews_demo/config/install/simplenews.newsletter.weekly_content.yml
+++ b/modules/simplenews_demo/config/install/simplenews.newsletter.weekly_content.yml
@@ -3,11 +3,11 @@ name: 'Weekly content update'
 description: 'Weekly content update newsletter.'
 format: plain
 priority: 0
-receipt: 0
+receipt: false
 from_name: ''
 subject: '[[simplenews-newsletter:name]] [node:title]'
 from_address: 'replace@example.org'
-hyperlinks: 1
+hyperlinks: true
 new_account: none
 opt_inout: double
 weight: 0
diff --git a/modules/simplenews_demo/simplenews_demo.info.yml b/modules/simplenews_demo/simplenews_demo.info.yml
index 80e2519..eb00adf 100644
--- a/modules/simplenews_demo/simplenews_demo.info.yml
+++ b/modules/simplenews_demo/simplenews_demo.info.yml
@@ -1,6 +1,8 @@
 description: Demo module for simplenews.
 core: 8.x
 dependencies:
+  - block
+  - views
   - simplenews
   - simplenews_scheduler
 hidden: false
diff --git a/modules/simplenews_demo/simplenews_demo.install b/modules/simplenews_demo/simplenews_demo.install
index e082083..ca942f3 100644
--- a/modules/simplenews_demo/simplenews_demo.install
+++ b/modules/simplenews_demo/simplenews_demo.install
@@ -19,6 +19,11 @@ function simplenews_demo_install() {
 
   \Drupal::service('router.builder')->rebuild();
 
+  // Set the default theme as active.
+  $theme = Drupal::theme();
+  $default_theme = Drupal::config('system.theme');
+//  $theme->setActiveTheme();
+
   // Set the default values for test_address, from_address and from_name.
   $site_mail = \Drupal::config('system.site')->get('mail');
   $site_name = \Drupal::config('system.site')->get('name');
diff --git a/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php b/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php
new file mode 100644
index 0000000..4674f7a
--- /dev/null
+++ b/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\simplenews_demo\Tests\SimplenewsDemoTest.
+ */
+
+namespace Drupal\simplenews_demo\Tests;
+
+use Drupal\search_api\Tests\WebTestBase;
+
+/**
+ * Tests the demo module for Simplenews.
+ *
+ * @group simplenews
+ */
+class SimplenewsDemoTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var string[]
+   */
+  public static $modules = array('simplenews_demo');
+
+  /**
+   * {@inheritdoc}
+   */
+  function setUp() {
+    parent::setUp();
+    // Install bartik theme.
+    \Drupal::service('theme_handler')->install(array('bartik'));
+    $theme_settings = $this->config('system.theme');
+    $theme_settings->set('default', 'bartik')->save();
+    // Log in with all relevant permissions.
+    $this->drupalLogin($this->drupalCreateUser(['administer simplenews subscriptions', 'send newsletter', 'administer newsletters', 'administer simplenews settings']));
+  }
+
+  /**
+   * Asserts the demo instructions on the frontpage.
+   */
+  protected function testInstalled() {
+    $this->drupalGet('admin/config/services/simplenews');
+    $this->clickLink(t('Edit'));
+    // Assert default Description is present.
+    $this->assertEqual('This is an example newsletter. Change it.', (string) $this->xpath('//textarea[@id="edit-description"]')[0]);
+    $from_name = $this->xpath('//input[@id="edit-from-name"]')[0];
+    $from_address = $this->xpath('//input[@id="edit-from-address"]')[0];
+    $this->assertEqual('Drupal', (string) $from_name['value']);
+    $this->assertEqual('simpletest@example.com', (string) $from_address['value']);
+    // Assert demo newsletters.
+    $this->drupalGet('admin/config/services/simplenews');
+    $this->assertText(t('Press releases'));
+    $this->assertText(t('Special offers'));
+    $this->assertText(t('Weekly content update'));
+    // Assert demo newsletters sent.
+    $this->drupalGet('admin/content/simplenews');
+    $this->assertText('Scheduled weekly content newsletter issue');
+    $this->assertText('Sent press releases');
+    $this->assertText('Unpublished press releases');
+    $this->assertText('Pending special offers');
+    $this->assertText('Stopped special offers');
+    $this->assertText('Scheduled weekly content newsletter issue - Week ');
+    $this->assertRaw(t('Newsletter issue sent to 2 subscribers.'));
+    $this->assertRaw(t('Newsletter issue is pending, 0 mails sent out of 3.'));
+    $this->assertRaw(t('Newsletter issue is pending, 0 mails sent out of 1.'));
+    // Assert demo subscribers.
+    $this->drupalGet('admin/people/simplenews');
+    $this->assertText('a@example.com');
+    $this->assertText('b@example.com');
+    $this->assertText('demouser1@example.com');
+  }
+
+}
diff --git a/src/Plugin/views/field/SendStatus.php b/src/Plugin/views/field/SendStatus.php
index 45d88dc..509c6de 100644
--- a/src/Plugin/views/field/SendStatus.php
+++ b/src/Plugin/views/field/SendStatus.php
@@ -56,7 +56,7 @@ class SendStatus extends FieldPluginBase {
    */
   protected function getMessage($node) {
     $status = $node->simplenews_issue->status;
-    $sent_count = $node->simplenews_issue->sent_count;
+    $sent_count = (int) $node->simplenews_issue->sent_count;
     $published = $node->isPublished();
     $subscriber_count = $node->simplenews_issue->status == SIMPLENEWS_STATUS_SEND_READY ? $node->simplenews_issue->subscribers : simplenews_count_subscriptions($node->simplenews_issue->target_id);
     $message = array();
@@ -67,11 +67,11 @@ class SendStatus extends FieldPluginBase {
       SIMPLENEWS_STATUS_SEND_READY => 'images/sn-sent.png',
     );
     if ($status == SIMPLENEWS_STATUS_SEND_READY) {
-      $message['description'] = 'Newsletter issue sent to ' . $sent_count . ' subscribers.';
+      $message['description'] = t('Newsletter issue sent to @sent_count subscribers.', ['@sent_count' => $sent_count]);
       $message['uri'] = drupal_get_path('module', 'simplenews') . '/' . $images[$status];
     }
     elseif ($status == SIMPLENEWS_STATUS_SEND_PENDING) {
-      $message['description'] = t('Newsletter issue is pending,@sent_count mails sent out of @count.', array(
+      $message['description'] = t('Newsletter issue is pending, @sent_count mails sent out of @count.', array(
           '@sent_count' => $sent_count,
           '@count' => $subscriber_count
         ));
diff --git a/src/Tests/SimplenewsAdministrationTest.php b/src/Tests/SimplenewsAdministrationTest.php
index 00d0e29..acb98f6 100644
--- a/src/Tests/SimplenewsAdministrationTest.php
+++ b/src/Tests/SimplenewsAdministrationTest.php
@@ -894,7 +894,7 @@ class SimplenewsAdministrationTest extends SimplenewsTestBase {
         $this->assertEqual('Newsletter issue will be sent to 3 subscribers on publish.', trim((string) $row->td[5]->span['title']));
       }
       else {
-        $this->assertEqual('Newsletter issue is pending,0 mails sent out of 3.', trim((string) $row->td[5]->img['title']));
+        $this->assertEqual('Newsletter issue is pending, 0 mails sent out of 3.', trim((string) $row->td[5]->img['title']));
         $this->assertEqual(file_create_url(drupal_get_path('module', 'simplenews')) . '/images/sn-cron.png', trim((string) $row->td[5]->img['src']));
       }
     }