diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml
index f62a6123..e97eca38 100644
--- a/src/flextype/settings.yaml
+++ b/src/flextype/settings.yaml
@@ -730,8 +730,8 @@ parsers:
         class: "Flextype\\Parsers\\Expressions\\WhenExpression"
       unless:
         enabled: true
-        class: "Flextype\\Parsers\\Expressions\\UnlessnExpression"
-        
+        class: "Flextype\\Parsers\\Expressions\\UnlessExpression"
+
 # CORS
 #
 # CORS (Cross-origin resource sharing) allows JavaScript web apps to make HTTP requests to other domains.
diff --git a/tests/fixtures/settings/settings.yaml b/tests/fixtures/settings/settings.yaml
index 1ce2ff26..a17230a2 100644
--- a/tests/fixtures/settings/settings.yaml
+++ b/tests/fixtures/settings/settings.yaml
@@ -725,6 +725,12 @@ parsers:
       url:
         enabled: true
         class: "Flextype\\Parsers\\Expressions\\UrlExpression"
+      when:
+        enabled: true
+        class: "Flextype\\Parsers\\Expressions\\WhenExpression"
+      unless:
+        enabled: true
+        class: "Flextype\\Parsers\\Expressions\\UnlessExpression"
 
 # CORS
 #
diff --git a/tests/src/flextype/core/Parsers/Expressions/DateExpressionTest.php b/tests/src/flextype/core/Parsers/Expressions/DateExpressionTest.php
index 6a83e4cd..42777561 100644
--- a/tests/src/flextype/core/Parsers/Expressions/DateExpressionTest.php
+++ b/tests/src/flextype/core/Parsers/Expressions/DateExpressionTest.php
@@ -26,6 +26,6 @@ test('time expression', function () {
 
 test('strtotime expression', function () {
     $date = strtotime("10 September 2000");
-    entries()->create('strtotime', ['test' => '[[ strtotime("10 September 2000") ]]']);
+    entries()->create('strtotime', ['test' => '@type[int] [[ strtotime("10 September 2000") ]]']);
     expect(entries()->fetch('strtotime')['test'])->toBe($date);
 });
\ No newline at end of file