diff --git a/mailpoet.php b/mailpoet.php
index 8b6e49dfb0..22eeedc13f 100644
--- a/mailpoet.php
+++ b/mailpoet.php
@@ -4,7 +4,7 @@ if(!defined('ABSPATH')) exit;
 use \MailPoet\Config\Initializer;
 /*
  * Plugin Name: MailPoet
- * Version: 0.0.35
+ * Version: 0.0.36
  * Plugin URI: http://www.mailpoet.com
  * Description: MailPoet Newsletters.
  * Author: MailPoet
@@ -22,7 +22,7 @@ use \MailPoet\Config\Initializer;
 
 require 'vendor/autoload.php';
 
-define('MAILPOET_VERSION', '0.0.35');
+define('MAILPOET_VERSION', '0.0.36');
 
 $initializer = new Initializer(array(
   'file' => __FILE__,
diff --git a/tests/unit/Mailer/MailerTest.php b/tests/unit/Mailer/MailerTest.php
index e729cbf4eb..eeee942bad 100644
--- a/tests/unit/Mailer/MailerTest.php
+++ b/tests/unit/Mailer/MailerTest.php
@@ -73,7 +73,7 @@ class MailerTest extends MailPoetTest {
       $mailer = new Mailer();
       $this->fail('Mailer did not throw an exception');
     } catch(Exception $e) {
-      expect($e->getMessage())->equals('Mailer is not configured.');
+      expect($e->getMessage())->equals('Mailer is not configured');
     }
   }
 
@@ -82,7 +82,7 @@ class MailerTest extends MailPoetTest {
       $mailer = new Mailer($mailer = $this->mailer);
       $this->fail('Mailer did not throw an exception');
     } catch(Exception $e) {
-      expect($e->getMessage())->equals('Sender name and email are not configured.');
+      expect($e->getMessage())->equals('Sender name and email are not configured');
     }
   }
 
@@ -108,7 +108,7 @@ class MailerTest extends MailPoetTest {
       $mailer = new Mailer(array('method' => 'Unknown'), $this->sender);
       $this->fail('Mailer did not throw an exception');
     } catch(Exception $e) {
-      expect($e->getMessage())->equals('Mailing method does not exist.');
+      expect($e->getMessage())->equals('Mailing method does not exist');
     }
   }
 
@@ -155,4 +155,4 @@ class MailerTest extends MailPoetTest {
     $mailer = new Mailer($this->mailer, $this->sender, $this->reply_to);
     expect($mailer->send($this->newsletter, $this->subscriber))->true();
   }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/Models/CustomFieldTest.php b/tests/unit/Models/CustomFieldTest.php
index d9eb649520..ccc9bfd8e3 100644
--- a/tests/unit/Models/CustomFieldTest.php
+++ b/tests/unit/Models/CustomFieldTest.php
@@ -72,8 +72,8 @@ class CustomFieldTest extends MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals('Please specify a name.');
-    expect($errors[1])->equals('Please specify a type.');
+    expect($errors[0])->equals('Please specify a name');
+    expect($errors[1])->equals('Please specify a type');
   }
 
   function testItHasACreatedAtOnCreation() {
diff --git a/tests/unit/Models/FormTest.php b/tests/unit/Models/FormTest.php
index 55590a9a1e..44369dc866 100644
--- a/tests/unit/Models/FormTest.php
+++ b/tests/unit/Models/FormTest.php
@@ -19,7 +19,7 @@ class FormTest extends MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals('Please specify a name.');
+    expect($errors[0])->equals('Please specify a name');
   }
 
   function testItCanBeGrouped() {
diff --git a/tests/unit/Models/NewsletterOptionFieldTest.php b/tests/unit/Models/NewsletterOptionFieldTest.php
index 4ec469cde1..829cdd2d45 100644
--- a/tests/unit/Models/NewsletterOptionFieldTest.php
+++ b/tests/unit/Models/NewsletterOptionFieldTest.php
@@ -53,8 +53,8 @@ class NewsletterOptionFieldTest extends MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals('Please specify a name.');
-    expect($errors[1])->equals('Please specify a newsletter type.');
+    expect($errors[0])->equals('Please specify a name');
+    expect($errors[1])->equals('Please specify a newsletter type');
   }
 
   function testItHasACreatedAtOnCreation() {
diff --git a/tests/unit/Models/NewsletterTemplateTest.php b/tests/unit/Models/NewsletterTemplateTest.php
index c7c2e5e136..665a05603d 100644
--- a/tests/unit/Models/NewsletterTemplateTest.php
+++ b/tests/unit/Models/NewsletterTemplateTest.php
@@ -26,8 +26,8 @@ class NewsletterTemplateTest extends MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals('Please specify a name.');
-    expect($errors[1])->equals('The template body cannot be empty.');
+    expect($errors[0])->equals('Please specify a name');
+    expect($errors[1])->equals('The template body cannot be empty');
   }
 
   function testItHasName() {
diff --git a/tests/unit/Models/SegmentTest.php b/tests/unit/Models/SegmentTest.php
index 34c9cc226b..ca6a26a04b 100644
--- a/tests/unit/Models/SegmentTest.php
+++ b/tests/unit/Models/SegmentTest.php
@@ -72,7 +72,7 @@ class SegmentTest extends MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals('Please specify a name.');
+    expect($errors[0])->equals('Please specify a name');
   }
 
   function testItHasACreatedAtOnCreation() {
diff --git a/tests/unit/Models/SettingTest.php b/tests/unit/Models/SettingTest.php
index ac23fe85fd..975b751ee1 100644
--- a/tests/unit/Models/SettingTest.php
+++ b/tests/unit/Models/SettingTest.php
@@ -16,7 +16,7 @@ class SettingTest extends MailPoetTest {
     $errors = $invalid_setting->getErrors();
 
     expect($errors)->notEmpty();
-    expect($errors[0])->equals('Please specify a name.');
+    expect($errors[0])->equals('Please specify a name');
   }
 
   function testItHasDefaultSettings() {
diff --git a/tests/unit/Models/SubscriberTest.php b/tests/unit/Models/SubscriberTest.php
index 0110aea73b..e959dd7b52 100644
--- a/tests/unit/Models/SubscriberTest.php
+++ b/tests/unit/Models/SubscriberTest.php
@@ -56,7 +56,7 @@ class SubscriberTest extends MailPoetTest {
     ));
     $subscriber->save();
     $errors = $subscriber->getErrors();
-    expect($errors)->contains("Your email address is invalid.");
+    expect($errors)->contains("Your email address is invalid!");
 
     // pdo error
     $subscriber = Subscriber::create();
@@ -443,4 +443,4 @@ class SubscriberTest extends MailPoetTest {
     ORM::raw_execute('TRUNCATE ' . CustomField::$_table);
     ORM::raw_execute('TRUNCATE ' . SubscriberCustomField::$_table);
   }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/Router/CustomFieldsTest.php b/tests/unit/Router/CustomFieldsTest.php
index e756a00ad3..e808a419b0 100644
--- a/tests/unit/Router/CustomFieldsTest.php
+++ b/tests/unit/Router/CustomFieldsTest.php
@@ -95,18 +95,18 @@ class CustomFieldsTest extends MailPoetTest {
     // missing type
     $response = $router->save(array('name' => 'New custom field'));
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a type.');
+    expect($response['errors'][0])->equals('Please specify a type');
 
     // missing name
     $response = $router->save(array('type' => 'text'));
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a name.');
+    expect($response['errors'][0])->equals('Please specify a name');
 
     // missing data
     $response = $router->save();
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a name.');
-    expect($response['errors'][1])->equals('Please specify a type.');
+    expect($response['errors'][0])->equals('Please specify a name');
+    expect($response['errors'][1])->equals('Please specify a type');
   }
 
   function testItCanGetACustomField() {
diff --git a/tests/unit/Router/FormsTest.php b/tests/unit/Router/FormsTest.php
index 746ed2b538..6eb2619eff 100644
--- a/tests/unit/Router/FormsTest.php
+++ b/tests/unit/Router/FormsTest.php
@@ -59,7 +59,7 @@ class FormsTest extends MailPoetTest {
     $router = new Forms();
     $response = $router->save(/* missing data */);
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a name.');
+    expect($response['errors'][0])->equals('Please specify a name');
 
     $response = $router->save($form_data);
     expect($response['result'])->true();
diff --git a/tests/unit/Router/NewslettersTest.php b/tests/unit/Router/NewslettersTest.php
index d94d478125..c6251a619f 100644
--- a/tests/unit/Router/NewslettersTest.php
+++ b/tests/unit/Router/NewslettersTest.php
@@ -48,7 +48,7 @@ class NewslettersTest extends MailPoetTest {
 
     $response = $router->save($invalid_data);
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a type.');
+    expect($response['errors'][0])->equals('Please specify a type');
   }
 
   function testItCanSaveAnExistingNewsletter() {
@@ -123,7 +123,7 @@ class NewslettersTest extends MailPoetTest {
 
     $response = $router->create();
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a type.');
+    expect($response['errors'][0])->equals('Please specify a type');
   }
 
   function testItCanGetListingData() {
diff --git a/tests/unit/Router/SegmentsTest.php b/tests/unit/Router/SegmentsTest.php
index 28b3734a05..8e745b601b 100644
--- a/tests/unit/Router/SegmentsTest.php
+++ b/tests/unit/Router/SegmentsTest.php
@@ -44,7 +44,7 @@ class SegmentsTest extends MailPoetTest {
     $router = new Segments();
     $response = $router->save(/* missing data */);
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a name.');
+    expect($response['errors'][0])->equals('Please specify a name');
 
     $response = $router->save($segment_data);
     expect($response['result'])->true();
diff --git a/tests/unit/Router/SubscribersTest.php b/tests/unit/Router/SubscribersTest.php
index 6c861fd3fd..95deb93d5d 100644
--- a/tests/unit/Router/SubscribersTest.php
+++ b/tests/unit/Router/SubscribersTest.php
@@ -67,7 +67,7 @@ class SubscribersTest extends MailPoetTest {
 
     $response = $router->save(/* missing data */);
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please enter your email address.');
+    expect($response['errors'][0])->equals('Please enter your email address');
 
     $invalid_data = array(
       'email' => 'john.doe@invalid'
@@ -75,7 +75,7 @@ class SubscribersTest extends MailPoetTest {
 
     $response = $router->save($invalid_data);
     expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Your email address is invalid.');
+    expect($response['errors'][0])->equals('Your email address is invalid!');
   }
 
   function testItCanSaveAnExistingSubscriber() {
diff --git a/tests/unit/Subscribers/ImportExport/Export/ExportTest.php b/tests/unit/Subscribers/ImportExport/Export/ExportTest.php
index 3081d040b7..1daf3daf87 100644
--- a/tests/unit/Subscribers/ImportExport/Export/ExportTest.php
+++ b/tests/unit/Subscribers/ImportExport/Export/ExportTest.php
@@ -225,7 +225,7 @@ class ExportTest extends MailPoetTest {
     $this->export->export_path = '/fake_folder';
     $result = $this->export->process();
     expect($result['errors'][0])
-      ->equals("Couldn't save export file on the server.");
+      ->equals("Couldn't save export file on the server");
   }
 
   function testItCanProcess() {