diff --git a/test/autotests/api-compiler/compileFileForBrowser-callback.js/template.marko b/test/autotests/api-compiler/compileFileForBrowser-callback.js/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api-compiler/compileFileForBrowser-callback.js/template.marko
+++ b/test/autotests/api-compiler/compileFileForBrowser-callback.js/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api-compiler/compileFileForBrowser.js/template.marko b/test/autotests/api-compiler/compileFileForBrowser.js/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api-compiler/compileFileForBrowser.js/template.marko
+++ b/test/autotests/api-compiler/compileFileForBrowser.js/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api-compiler/compileForBrowser-callback.js/template.marko b/test/autotests/api-compiler/compileForBrowser-callback.js/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api-compiler/compileForBrowser-callback.js/template.marko
+++ b/test/autotests/api-compiler/compileForBrowser-callback.js/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api-compiler/compileForBrowser.js/template.marko b/test/autotests/api-compiler/compileForBrowser.js/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api-compiler/compileForBrowser.js/template.marko
+++ b/test/autotests/api-compiler/compileForBrowser.js/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/load-render-callback/template.marko b/test/autotests/api/load-render-callback/template.marko
index 2f2627e85..1e2244941 100644
--- a/test/autotests/api/load-render-callback/template.marko
+++ b/test/autotests/api/load-render-callback/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
diff --git a/test/autotests/api/load-render-promise/template.marko b/test/autotests/api/load-render-promise/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/load-render-promise/template.marko
+++ b/test/autotests/api/load-render-promise/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/load-source/template.marko b/test/autotests/api/load-source/template.marko
index 2f2627e85..1e2244941 100644
--- a/test/autotests/api/load-source/template.marko
+++ b/test/autotests/api/load-source/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
diff --git a/test/autotests/api/load-source/test.js b/test/autotests/api/load-source/test.js
index e2e72aba2..de849b98d 100644
--- a/test/autotests/api/load-source/test.js
+++ b/test/autotests/api/load-source/test.js
@@ -7,12 +7,12 @@ exports.check = function(marko, markoCompiler, expect, done) {
 
     // Make sure calling load with templatePath:String, templateSrc:String arguments works
     templatePath = nodePath.join(__dirname, 'dummy.marko');
-    template = marko.load(templatePath, '- Hello $!{data.name}!');
+    template = marko.load(templatePath, '-- Hello $!{data.name}!');
     expect(template.renderSync({name: 'Frank'}).toString()).to.equal('Hello Frank!');
 
     // Make sure calling load with templatePath:String, templateSrc:String, options:Object arguments works
     templatePath = nodePath.join(__dirname, 'dummy.marko');
-    template = marko.load(templatePath, '- Hello $!{data.name}!', {});
+    template = marko.load(templatePath, '-- Hello $!{data.name}!', {});
     expect(template.renderSync({name: 'Frank'}).toString()).to.equal('Hello Frank!');
 
     // Make sure calling load with templatePath:String, options:Object arguments works
diff --git a/test/autotests/api/load-writer-wrapping-stream/template.marko b/test/autotests/api/load-writer-wrapping-stream/template.marko
index 2f2627e85..1e2244941 100644
--- a/test/autotests/api/load-writer-wrapping-stream/template.marko
+++ b/test/autotests/api/load-writer-wrapping-stream/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
diff --git a/test/autotests/api/load-writer-wrapping-string-builder/template.marko b/test/autotests/api/load-writer-wrapping-string-builder/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/load-writer-wrapping-string-builder/template.marko
+++ b/test/autotests/api/load-writer-wrapping-string-builder/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/no-write-to-disk-load/template.marko b/test/autotests/api/no-write-to-disk-load/template.marko
index 2f2627e85..1e2244941 100644
--- a/test/autotests/api/no-write-to-disk-load/template.marko
+++ b/test/autotests/api/no-write-to-disk-load/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
diff --git a/test/autotests/api/no-write-to-disk-require/template.marko b/test/autotests/api/no-write-to-disk-require/template.marko
index 2f2627e85..1e2244941 100644
--- a/test/autotests/api/no-write-to-disk-require/template.marko
+++ b/test/autotests/api/no-write-to-disk-require/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
diff --git a/test/autotests/api/render-callback-args/template.marko b/test/autotests/api/render-callback-args/template.marko
index 2f2627e85..1e2244941 100644
--- a/test/autotests/api/render-callback-args/template.marko
+++ b/test/autotests/api/render-callback-args/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
diff --git a/test/autotests/api/render-callback-global-data/template.marko b/test/autotests/api/render-callback-global-data/template.marko
index b31ec05ae..36e89d1ab 100644
--- a/test/autotests/api/render-callback-global-data/template.marko
+++ b/test/autotests/api/render-callback-global-data/template.marko
@@ -1 +1 @@
-- ${out.global.greeting} ${data.name}!
+-- ${out.global.greeting} ${data.name}!
diff --git a/test/autotests/api/render-readable-stream-global-data/template.marko b/test/autotests/api/render-readable-stream-global-data/template.marko
index cca3bd777..6b6d48e6f 100644
--- a/test/autotests/api/render-readable-stream-global-data/template.marko
+++ b/test/autotests/api/render-readable-stream-global-data/template.marko
@@ -1 +1 @@
-- ${out.global.foo}
\ No newline at end of file
+-- ${out.global.foo}
\ No newline at end of file
diff --git a/test/autotests/api/render-writable-stream-global-data/template.marko b/test/autotests/api/render-writable-stream-global-data/template.marko
index cca3bd777..6b6d48e6f 100644
--- a/test/autotests/api/render-writable-stream-global-data/template.marko
+++ b/test/autotests/api/render-writable-stream-global-data/template.marko
@@ -1 +1 @@
-- ${out.global.foo}
\ No newline at end of file
+-- ${out.global.foo}
\ No newline at end of file
diff --git a/test/autotests/api/renderSync-global-data/template.marko b/test/autotests/api/renderSync-global-data/template.marko
index 1b2398183..08bf5a13d 100644
--- a/test/autotests/api/renderSync-global-data/template.marko
+++ b/test/autotests/api/renderSync-global-data/template.marko
@@ -1 +1 @@
-- ${out.global.greeting} ${data.name}!
\ No newline at end of file
+-- ${out.global.greeting} ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/renderSync-no-data/template.marko b/test/autotests/api/renderSync-no-data/template.marko
index 9d9b48360..8ccee3bc4 100644
--- a/test/autotests/api/renderSync-no-data/template.marko
+++ b/test/autotests/api/renderSync-no-data/template.marko
@@ -1 +1 @@
-- Hello!
\ No newline at end of file
+-- Hello!
\ No newline at end of file
diff --git a/test/autotests/api/renderSync/template.marko b/test/autotests/api/renderSync/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/renderSync/template.marko
+++ b/test/autotests/api/renderSync/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/renderToString-callback-async/template.marko b/test/autotests/api/renderToString-callback-async/template.marko
index ee39e9fa6..e324258f0 100644
--- a/test/autotests/api/renderToString-callback-async/template.marko
+++ b/test/autotests/api/renderToString-callback-async/template.marko
@@ -1,2 +1,2 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
 <test-async/>
\ No newline at end of file
diff --git a/test/autotests/api/renderToString-callback-sync/template.marko b/test/autotests/api/renderToString-callback-sync/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/renderToString-callback-sync/template.marko
+++ b/test/autotests/api/renderToString-callback-sync/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/renderToString-no-callback-async/template.marko b/test/autotests/api/renderToString-no-callback-async/template.marko
index ee39e9fa6..e324258f0 100644
--- a/test/autotests/api/renderToString-no-callback-async/template.marko
+++ b/test/autotests/api/renderToString-no-callback-async/template.marko
@@ -1,2 +1,2 @@
-- Hello ${data.name}!
+-- Hello ${data.name}!
 <test-async/>
\ No newline at end of file
diff --git a/test/autotests/api/renderToString/template.marko b/test/autotests/api/renderToString/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/renderToString/template.marko
+++ b/test/autotests/api/renderToString/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/require-compiled-template/template.marko b/test/autotests/api/require-compiled-template/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/require-compiled-template/template.marko
+++ b/test/autotests/api/require-compiled-template/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/require-render-callback/template.marko b/test/autotests/api/require-render-callback/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/require-render-callback/template.marko
+++ b/test/autotests/api/require-render-callback/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/require-render-to-stream/template.marko b/test/autotests/api/require-render-to-stream/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/require-render-to-stream/template.marko
+++ b/test/autotests/api/require-render-to-stream/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/write-to-disk-load/template.marko b/test/autotests/api/write-to-disk-load/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/write-to-disk-load/template.marko
+++ b/test/autotests/api/write-to-disk-load/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/write-to-disk-require/template.marko b/test/autotests/api/write-to-disk-require/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/write-to-disk-require/template.marko
+++ b/test/autotests/api/write-to-disk-require/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/api/writeToDisk-false-include/include-target.marko b/test/autotests/api/writeToDisk-false-include/include-target.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/api/writeToDisk-false-include/include-target.marko
+++ b/test/autotests/api/writeToDisk-false-include/include-target.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/async-fragments-deprecated/async-fragment-timeout/template.marko b/test/autotests/async-fragments-deprecated/async-fragment-timeout/template.marko
index 24f1ad7c2..d4d87f936 100644
--- a/test/autotests/async-fragments-deprecated/async-fragment-timeout/template.marko
+++ b/test/autotests/async-fragments-deprecated/async-fragment-timeout/template.marko
@@ -1,4 +1,4 @@
-- BEFORE
+-- BEFORE
 <async-fragment data-provider=data.userInfoShort
     var="user"
     timeout=500
@@ -33,4 +33,4 @@
     </async-fragment-timeout>
     4
 </async-fragment>
-- AFTER
\ No newline at end of file
+-- AFTER
\ No newline at end of file
diff --git a/test/autotests/async-render/await-timeout/template.marko b/test/autotests/async-render/await-timeout/template.marko
index 671d3eb2f..35f3a53e2 100644
--- a/test/autotests/async-render/await-timeout/template.marko
+++ b/test/autotests/async-render/await-timeout/template.marko
@@ -1,4 +1,4 @@
-- BEFORE
+-- BEFORE
 <await(user from data.userInfoShort)
     timeout=500
     name="userInfo1">
@@ -29,4 +29,4 @@
     </await-timeout>
     4
 </await>
-- AFTER
\ No newline at end of file
+-- AFTER
\ No newline at end of file
diff --git a/test/autotests/compiler/addNestedVariable/template.marko b/test/autotests/compiler/addNestedVariable/template.marko
index a5e1e23df..97597be58 100644
--- a/test/autotests/compiler/addNestedVariable/template.marko
+++ b/test/autotests/compiler/addNestedVariable/template.marko
@@ -1 +1 @@
-test-addNestedVariable - Hello ${foo}!
\ No newline at end of file
+test-addNestedVariable -- Hello ${foo}!
\ No newline at end of file
diff --git a/test/autotests/compiler/for-array/template.marko b/test/autotests/compiler/for-array/template.marko
index e5c9ede42..168ba4ace 100644
--- a/test/autotests/compiler/for-array/template.marko
+++ b/test/autotests/compiler/for-array/template.marko
@@ -1,2 +1,2 @@
 for(color in ['red', 'green', 'blue'] | array)
-    - ${color}
\ No newline at end of file
+    -- ${color}
\ No newline at end of file
diff --git a/test/autotests/compiler/hello-dynamic/template.marko b/test/autotests/compiler/hello-dynamic/template.marko
index e9fff3b74..a6b2b14e1 100644
--- a/test/autotests/compiler/hello-dynamic/template.marko
+++ b/test/autotests/compiler/hello-dynamic/template.marko
@@ -1 +1 @@
-- Hello ${data.name}! Hello $!{data.name}! Hello $!{data.missing}!
\ No newline at end of file
+-- Hello ${data.name}! Hello $!{data.name}! Hello $!{data.missing}!
\ No newline at end of file
diff --git a/test/autotests/compiler/static/template.marko b/test/autotests/compiler/static/template.marko
index f1a2fd283..7db3fbf4b 100644
--- a/test/autotests/compiler/static/template.marko
+++ b/test/autotests/compiler/static/template.marko
@@ -1 +1 @@
-- Hello John
\ No newline at end of file
+-- Hello John
\ No newline at end of file
diff --git a/test/autotests/hot-reload/load/template.marko b/test/autotests/hot-reload/load/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/hot-reload/load/template.marko
+++ b/test/autotests/hot-reload/load/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/hot-reload/require/template.marko b/test/autotests/hot-reload/require/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/hot-reload/require/template.marko
+++ b/test/autotests/hot-reload/require/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/inline/concise/index.js b/test/autotests/inline/concise/index.js
index 2105be9ae..14d3a763a 100644
--- a/test/autotests/inline/concise/index.js
+++ b/test/autotests/inline/concise/index.js
@@ -2,8 +2,8 @@ module.exports = function() {
     var name = 'Frank';
     var template = marko`
         div
-            - Hello ${name}!
-        span - Test
+            -- Hello ${name}!
+        span -- Test
         `;
 
     return template.renderSync();
diff --git a/test/autotests/inline/layout-template/index.js b/test/autotests/inline/layout-template/index.js
index de25b912c..523a09776 100644
--- a/test/autotests/inline/layout-template/index.js
+++ b/test/autotests/inline/layout-template/index.js
@@ -5,7 +5,7 @@ var layout = marko`
             meta charset="UTF-8"
             <title>${data.title}</title>
         body
-            h1 - ${data.title}
+            h1 -- ${data.title}
             div
                 layout-placeholder name="body"
     `;
@@ -17,7 +17,7 @@ module.exports = function() {
     var template = marko`
         layout-use(layout) title=title
             layout-put into="body"
-                - Hello ${name}! This is the body content!
+                -- Hello ${name}! This is the body content!
     `;
 
     return template.renderSync();
diff --git a/test/autotests/inline/multiple-templates-custom-tags/components/test-bar/template.marko b/test/autotests/inline/multiple-templates-custom-tags/components/test-bar/template.marko
index a5989693d..bab9814a0 100644
--- a/test/autotests/inline/multiple-templates-custom-tags/components/test-bar/template.marko
+++ b/test/autotests/inline/multiple-templates-custom-tags/components/test-bar/template.marko
@@ -1 +1 @@
-div.bar - BAR
\ No newline at end of file
+div.bar -- BAR
\ No newline at end of file
diff --git a/test/autotests/inline/multiple-templates-custom-tags/components/test-foo/template.marko b/test/autotests/inline/multiple-templates-custom-tags/components/test-foo/template.marko
index f31fbde73..c4916478d 100644
--- a/test/autotests/inline/multiple-templates-custom-tags/components/test-foo/template.marko
+++ b/test/autotests/inline/multiple-templates-custom-tags/components/test-foo/template.marko
@@ -1 +1 @@
-div.foo - FOO
\ No newline at end of file
+div.foo -- FOO
\ No newline at end of file
diff --git a/test/autotests/markoc/clean-dir/template1.marko b/test/autotests/markoc/clean-dir/template1.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/clean-dir/template1.marko
+++ b/test/autotests/markoc/clean-dir/template1.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/markoc/clean-dir/template2.marko b/test/autotests/markoc/clean-dir/template2.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/clean-dir/template2.marko
+++ b/test/autotests/markoc/clean-dir/template2.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/markoc/compile-dir/template1.marko b/test/autotests/markoc/compile-dir/template1.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/compile-dir/template1.marko
+++ b/test/autotests/markoc/compile-dir/template1.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/markoc/compile-dir/template2.marko b/test/autotests/markoc/compile-dir/template2.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/compile-dir/template2.marko
+++ b/test/autotests/markoc/compile-dir/template2.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/markoc/multiple-dirs/a/template.marko b/test/autotests/markoc/multiple-dirs/a/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/multiple-dirs/a/template.marko
+++ b/test/autotests/markoc/multiple-dirs/a/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/markoc/multiple-dirs/b/template.marko b/test/autotests/markoc/multiple-dirs/b/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/multiple-dirs/b/template.marko
+++ b/test/autotests/markoc/multiple-dirs/b/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/markoc/multiple-dirs/excluded/template.marko b/test/autotests/markoc/multiple-dirs/excluded/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/multiple-dirs/excluded/template.marko
+++ b/test/autotests/markoc/multiple-dirs/excluded/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/markoc/single-template/template.marko b/test/autotests/markoc/single-template/template.marko
index eabd502aa..4b6673751 100644
--- a/test/autotests/markoc/single-template/template.marko
+++ b/test/autotests/markoc/single-template/template.marko
@@ -1 +1 @@
-- Hello ${data.name}!
\ No newline at end of file
+-- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/render/assign-tag-unary-postfix/template.marko b/test/autotests/render/assign-tag-unary-postfix/template.marko
index 4f62ccfd1..450c63582 100644
--- a/test/autotests/render/assign-tag-unary-postfix/template.marko
+++ b/test/autotests/render/assign-tag-unary-postfix/template.marko
@@ -1,4 +1,4 @@
 <var foo=0/>
 <assign foo++/>
 
-- ${foo}
\ No newline at end of file
+-- ${foo}
\ No newline at end of file
diff --git a/test/autotests/render/assign-tag-unary-prefix/template.marko b/test/autotests/render/assign-tag-unary-prefix/template.marko
index a2c6cf49b..484c8c92c 100644
--- a/test/autotests/render/assign-tag-unary-prefix/template.marko
+++ b/test/autotests/render/assign-tag-unary-prefix/template.marko
@@ -1,4 +1,4 @@
 <var foo=5/>
 <assign --foo/>
 
-- ${foo}
\ No newline at end of file
+-- ${foo}
\ No newline at end of file
diff --git a/test/autotests/render/attr-newline-concise/template.marko b/test/autotests/render/attr-newline-concise/template.marko
index c85c7971f..c38ca19e6 100644
--- a/test/autotests/render/attr-newline-concise/template.marko
+++ b/test/autotests/render/attr-newline-concise/template.marko
@@ -1,3 +1,3 @@
 div class="foo
     bar"
-span - Hello World
\ No newline at end of file
+span -- Hello World
\ No newline at end of file
diff --git a/test/autotests/render/attr-template/foo-template.marko b/test/autotests/render/attr-template/foo-template.marko
index 496316b5d..672f2626d 100644
--- a/test/autotests/render/attr-template/foo-template.marko
+++ b/test/autotests/render/attr-template/foo-template.marko
@@ -1 +1 @@
-- [foo-template]
\ No newline at end of file
+-- [foo-template]
\ No newline at end of file
diff --git a/test/autotests/render/body-placeholder-literal/template.marko b/test/autotests/render/body-placeholder-literal/template.marko
index d80e71e5e..f78f049c2 100644
--- a/test/autotests/render/body-placeholder-literal/template.marko
+++ b/test/autotests/render/body-placeholder-literal/template.marko
@@ -1 +1 @@
-- A ${'B'} C
\ No newline at end of file
+-- A ${'B'} C
\ No newline at end of file
diff --git a/test/autotests/render/circular-renderer/tags/test-circular-renderer-a/template.marko b/test/autotests/render/circular-renderer/tags/test-circular-renderer-a/template.marko
index 4944f0984..a2efd62e7 100644
--- a/test/autotests/render/circular-renderer/tags/test-circular-renderer-a/template.marko
+++ b/test/autotests/render/circular-renderer/tags/test-circular-renderer-a/template.marko
@@ -1,2 +1,2 @@
-- test-circular-renderer-a
+-- test-circular-renderer-a
 <test-circular-renderer-b/>
\ No newline at end of file
diff --git a/test/autotests/render/circular-template/tags/test-circular-template-a/template.marko b/test/autotests/render/circular-template/tags/test-circular-template-a/template.marko
index 16f6e24f5..c2c17a773 100644
--- a/test/autotests/render/circular-template/tags/test-circular-template-a/template.marko
+++ b/test/autotests/render/circular-template/tags/test-circular-template-a/template.marko
@@ -1,2 +1,2 @@
-- test-circular-template-a
+-- test-circular-template-a
 <test-circular-template-b/>
\ No newline at end of file
diff --git a/test/autotests/render/circular-template/tags/test-circular-template-b/template.marko b/test/autotests/render/circular-template/tags/test-circular-template-b/template.marko
index ad8410aea..cc22fbb89 100644
--- a/test/autotests/render/circular-template/tags/test-circular-template-b/template.marko
+++ b/test/autotests/render/circular-template/tags/test-circular-template-b/template.marko
@@ -1 +1 @@
-- test-circular-template-b<test-circular-template-a if(false)/>
\ No newline at end of file
+-- test-circular-template-b<test-circular-template-a if(false)/>
\ No newline at end of file
diff --git a/test/autotests/render/comments-remove/template.marko b/test/autotests/render/comments-remove/template.marko
index 995319beb..667a33828 100644
--- a/test/autotests/render/comments-remove/template.marko
+++ b/test/autotests/render/comments-remove/template.marko
@@ -1,3 +1,3 @@
 <!--This comment should not be preserved-->
-- Hello World!
+-- Hello World!
 <!--This comment should not be preserved-->
\ No newline at end of file
diff --git a/test/autotests/render/concise-verbose/template.marko b/test/autotests/render/concise-verbose/template.marko
index 8b8516dc2..92431a059 100644
--- a/test/autotests/render/concise-verbose/template.marko
+++ b/test/autotests/render/concise-verbose/template.marko
@@ -1,4 +1,4 @@
-div - Hello ${data.name}
+div -- Hello ${data.name}
     <span if(data.name)>
         ${data.name}
     </span>
diff --git a/test/autotests/render/concise/template.marko b/test/autotests/render/concise/template.marko
index 1084c729d..6e0ac55a8 100644
--- a/test/autotests/render/concise/template.marko
+++ b/test/autotests/render/concise/template.marko
@@ -1,4 +1,4 @@
-div - Hello ${data.name}
+div -- Hello ${data.name}
     span if(data.name)
         ${data.name}
-    p else - No name!
+    p else -- No name!
diff --git a/test/autotests/render/entities/template.marko b/test/autotests/render/entities/template.marko
index 06b3c1283..f0dc262fb 100644
--- a/test/autotests/render/entities/template.marko
+++ b/test/autotests/render/entities/template.marko
@@ -1,4 +1,4 @@
 <div data-attr="Hello \"John\" <foo>">
     Hello &lt;John&gt;© <![CDATA[<hello>]]>
 </div>
-- &copy;
\ No newline at end of file
+-- &copy;
\ No newline at end of file
diff --git a/test/autotests/render/global-data/template.marko b/test/autotests/render/global-data/template.marko
index 511f099dc..553d81c76 100644
--- a/test/autotests/render/global-data/template.marko
+++ b/test/autotests/render/global-data/template.marko
@@ -1 +1 @@
-- Global: ${out.global.foo}
\ No newline at end of file
+-- Global: ${out.global.foo}
\ No newline at end of file
diff --git a/test/autotests/render/hello-dynamic/template.marko b/test/autotests/render/hello-dynamic/template.marko
index e9fff3b74..a6b2b14e1 100644
--- a/test/autotests/render/hello-dynamic/template.marko
+++ b/test/autotests/render/hello-dynamic/template.marko
@@ -1 +1 @@
-- Hello ${data.name}! Hello $!{data.name}! Hello $!{data.missing}!
\ No newline at end of file
+-- Hello ${data.name}! Hello $!{data.name}! Hello $!{data.missing}!
\ No newline at end of file
diff --git a/test/autotests/render/hello-static/template.marko b/test/autotests/render/hello-static/template.marko
index f1a2fd283..7db3fbf4b 100644
--- a/test/autotests/render/hello-static/template.marko
+++ b/test/autotests/render/hello-static/template.marko
@@ -1 +1 @@
-- Hello John
\ No newline at end of file
+-- Hello John
\ No newline at end of file
diff --git a/test/autotests/render/if-concise/template.marko b/test/autotests/render/if-concise/template.marko
index 7e76093e3..428d9fe81 100644
--- a/test/autotests/render/if-concise/template.marko
+++ b/test/autotests/render/if-concise/template.marko
@@ -1,2 +1,2 @@
 if(true)
-    - A
+    -- A
diff --git a/test/autotests/render/if-else-concise/template.marko b/test/autotests/render/if-else-concise/template.marko
index 5bdde9afe..b929d51bc 100644
--- a/test/autotests/render/if-else-concise/template.marko
+++ b/test/autotests/render/if-else-concise/template.marko
@@ -1,4 +1,4 @@
 if(false)
-    - A
+    -- A
 else
-    - B
+    -- B
diff --git a/test/autotests/render/if-else-if-concise/template.marko b/test/autotests/render/if-else-if-concise/template.marko
index 7406859d7..959bc5efc 100644
--- a/test/autotests/render/if-else-if-concise/template.marko
+++ b/test/autotests/render/if-else-if-concise/template.marko
@@ -1,4 +1,4 @@
 if(false)
-    - A
+    -- A
 else if(true)
-    - B
\ No newline at end of file
+    -- B
\ No newline at end of file
diff --git a/test/autotests/render/if-else-if-else-concise/template.marko b/test/autotests/render/if-else-if-else-concise/template.marko
index a0462b737..5bee6e187 100644
--- a/test/autotests/render/if-else-if-else-concise/template.marko
+++ b/test/autotests/render/if-else-if-else-concise/template.marko
@@ -1,6 +1,6 @@
 if(false)
-    - A
+    -- A
 else if(false)
-    - B
+    -- B
 else
-    - C
+    -- C
diff --git a/test/autotests/render/import/template.marko b/test/autotests/render/import/template.marko
index 839862db6..f903410d1 100644
--- a/test/autotests/render/import/template.marko
+++ b/test/autotests/render/import/template.marko
@@ -1,3 +1,3 @@
 <import mod, { b as bar } from "./bar" />
 <import test from './bar' />
-- ${mod.foo} ${bar} ${test.foo}
\ No newline at end of file
+-- ${mod.foo} ${bar} ${test.foo}
\ No newline at end of file
diff --git a/test/autotests/render/include-attr/include-target.marko b/test/autotests/render/include-attr/include-target.marko
index e41e68e50..73606bcce 100644
--- a/test/autotests/render/include-attr/include-target.marko
+++ b/test/autotests/render/include-attr/include-target.marko
@@ -1 +1 @@
-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include-data/include-target.marko b/test/autotests/render/include-data/include-target.marko
index e41e68e50..73606bcce 100644
--- a/test/autotests/render/include-data/include-target.marko
+++ b/test/autotests/render/include-data/include-target.marko
@@ -1 +1 @@
-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include-dynamic/include-target.marko b/test/autotests/render/include-dynamic/include-target.marko
index e41e68e50..73606bcce 100644
--- a/test/autotests/render/include-dynamic/include-target.marko
+++ b/test/autotests/render/include-dynamic/include-target.marko
@@ -1 +1 @@
-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko b/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko
index ead55d364..63d3d16ac 100644
--- a/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko
+++ b/test/autotests/render/include-hyphen-attrs-multiple/include-target.marko
@@ -1 +1 @@
-- Hello ${data.firstName} ${data.lastName}!
\ No newline at end of file
+-- Hello ${data.firstName} ${data.lastName}!
\ No newline at end of file
diff --git a/test/autotests/render/include-hyphen-attrs/include-target.marko b/test/autotests/render/include-hyphen-attrs/include-target.marko
index ea49956f3..67645f8d2 100644
--- a/test/autotests/render/include-hyphen-attrs/include-target.marko
+++ b/test/autotests/render/include-hyphen-attrs/include-target.marko
@@ -1 +1 @@
-- Hello ${data.firstName}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${data.firstName}! You have ${data.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/include/include-target.marko b/test/autotests/render/include/include-target.marko
index e41e68e50..73606bcce 100644
--- a/test/autotests/render/include/include-target.marko
+++ b/test/autotests/render/include/include-target.marko
@@ -1 +1 @@
-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
+-- Hello ${data.name}! You have ${data.count} new messages.
\ No newline at end of file
diff --git a/test/autotests/render/marko-compiler-options-preserve-comments/template.marko b/test/autotests/render/marko-compiler-options-preserve-comments/template.marko
index c5b3b0028..50403d1fb 100644
--- a/test/autotests/render/marko-compiler-options-preserve-comments/template.marko
+++ b/test/autotests/render/marko-compiler-options-preserve-comments/template.marko
@@ -5,4 +5,4 @@
 </div>
 div
     // This comment should be preserved
-    - Hello World!
+    -- Hello World!
diff --git a/test/autotests/render/nested-tags-concise/template.marko b/test/autotests/render/nested-tags-concise/template.marko
index 78641dc56..de0214d7d 100644
--- a/test/autotests/render/nested-tags-concise/template.marko
+++ b/test/autotests/render/nested-tags-concise/template.marko
@@ -1,5 +1,5 @@
 test-nested-tags-tabs
     test-nested-tags-tabs:tab title="Tab 1"
-        - Tab 1 content
+        -- Tab 1 content
     test-nested-tags-tabs:tab title="Tab 2"
-    test-nested-tags-tabs:tab title="Tab 3" - Tab 3 content
\ No newline at end of file
+    test-nested-tags-tabs:tab title="Tab 3" -- Tab 3 content
\ No newline at end of file
diff --git a/test/autotests/render/reserved-words/template.marko b/test/autotests/render/reserved-words/template.marko
index c63d776fa..69964300e 100644
--- a/test/autotests/render/reserved-words/template.marko
+++ b/test/autotests/render/reserved-words/template.marko
@@ -1,3 +1,3 @@
 <my-custom-tag short="World"/>
 
-- Hello ${data.short}
\ No newline at end of file
+-- Hello ${data.short}
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-div-id-dynamic/template.marko b/test/autotests/render/shorthand-div-id-dynamic/template.marko
index 4feaf2c68..7dbc5efa4 100644
--- a/test/autotests/render/shorthand-div-id-dynamic/template.marko
+++ b/test/autotests/render/shorthand-div-id-dynamic/template.marko
@@ -1,2 +1,2 @@
 div#foo-${data.name} style="color: red;"
-    - Hello ${data.name}!
\ No newline at end of file
+    -- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-div-id/template.marko b/test/autotests/render/shorthand-div-id/template.marko
index 6362b3846..5347018b9 100644
--- a/test/autotests/render/shorthand-div-id/template.marko
+++ b/test/autotests/render/shorthand-div-id/template.marko
@@ -1,2 +1,2 @@
 div#foo style="color: red;"
-    - Hello ${data.name}!
\ No newline at end of file
+    -- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/render/shorthand-div.foo/template.marko b/test/autotests/render/shorthand-div.foo/template.marko
index b2f580999..d269b5682 100644
--- a/test/autotests/render/shorthand-div.foo/template.marko
+++ b/test/autotests/render/shorthand-div.foo/template.marko
@@ -1,2 +1,2 @@
 div.foo style="color: red;"
-    - Hello ${data.name}!
\ No newline at end of file
+    -- Hello ${data.name}!
\ No newline at end of file
diff --git a/test/autotests/render/syntax-concise/template.marko b/test/autotests/render/syntax-concise/template.marko
index cc811f856..3c3b36900 100644
--- a/test/autotests/render/syntax-concise/template.marko
+++ b/test/autotests/render/syntax-concise/template.marko
@@ -4,9 +4,9 @@ var currentPage='home'
 <!DOCTYPE html>
 html lang="en"
     head
-        title - ${pageTitle}
+        title -- ${pageTitle}
     body
-        h1 - ${pageTitle}
+        h1 -- ${pageTitle}
 
         p
             ---
@@ -21,15 +21,15 @@ html lang="en"
                 ${feature}
 
         ul if(data.colors && data.colors.length)
-            li for(color in data.colors) - ${color}
+            li for(color in data.colors) -- ${color}
         div else
-            - No colors!
+            -- No colors!
 
         tabs
             tabs:tab title="Tab 1"
-                - Body content for Tab 1
+                -- Body content for Tab 1
             tabs:tab title="Tab 2"
-                - Body content for Tab 2
+                -- Body content for Tab 2
 
         script type='text/javascript'
             ---
@@ -40,7 +40,7 @@ html lang="en"
 
         macro navLink(id, href, title)
             li
-                a.nav-link class=(id === currentPage && 'active') href=href - ${title}
+                a.nav-link class=(id === currentPage && 'active') href=href -- ${title}
 
         ul
             navLink('home', '/', 'Home')
diff --git a/test/autotests/render/syntax-mixed/template.marko b/test/autotests/render/syntax-mixed/template.marko
index c9ff24511..67cf838d5 100644
--- a/test/autotests/render/syntax-mixed/template.marko
+++ b/test/autotests/render/syntax-mixed/template.marko
@@ -4,9 +4,9 @@
 <!DOCTYPE html>
 html lang="en"
     head
-        title - ${pageTitle}
+        title -- ${pageTitle}
     body
-        h1 - ${pageTitle}
+        h1 -- ${pageTitle}
 
         p
             ---
@@ -21,15 +21,15 @@ html lang="en"
                 ${feature}
 
         ul if(data.colors && data.colors.length)
-            li for(color in data.colors) - ${color}
+            li for(color in data.colors) -- ${color}
         div else
-            - No colors!
+            -- No colors!
 
         tabs
             tabs:tab title="Tab 1"
-                - Body content for Tab 1
+                -- Body content for Tab 1
             tabs:tab title="Tab 2"
-                - Body content for Tab 2
+                -- Body content for Tab 2
 
         <script type='text/javascript'>
         if (foo) {
diff --git a/test/autotests/render/syntax-simple-concise/template.marko b/test/autotests/render/syntax-simple-concise/template.marko
index 09ccb9b2e..24a7e90d4 100644
--- a/test/autotests/render/syntax-simple-concise/template.marko
+++ b/test/autotests/render/syntax-simple-concise/template.marko
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 html lang="en"
     head
-        title - Marko Templating Engine
+        title -- Marko Templating Engine
     body
-        h1 - Hello ${data.name}!
+        h1 -- Hello ${data.name}!
         ul if(data.colors.length)
             li for(color in data.colors)
                 ${color}
         div else
-            - No colors!
\ No newline at end of file
+            -- No colors!
\ No newline at end of file
diff --git a/test/autotests/render/syntax-simple-mixed/template.marko b/test/autotests/render/syntax-simple-mixed/template.marko
index ca434c1b3..9537bbcf1 100644
--- a/test/autotests/render/syntax-simple-mixed/template.marko
+++ b/test/autotests/render/syntax-simple-mixed/template.marko
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 html lang="en"
     head
-        title - Marko Templating Engine
+        title -- Marko Templating Engine
     body
         <h1>
             Hello ${data.name}!
@@ -10,4 +10,4 @@ html lang="en"
             li for(color in data.colors)
                 ${color}
         div else
-            - No colors!
\ No newline at end of file
+            -- No colors!
\ No newline at end of file
diff --git a/test/autotests/render/taglib-imports-nested/nested-import/components/list/icon-list/template.marko b/test/autotests/render/taglib-imports-nested/nested-import/components/list/icon-list/template.marko
index cd7b4c963..8215e4d39 100644
--- a/test/autotests/render/taglib-imports-nested/nested-import/components/list/icon-list/template.marko
+++ b/test/autotests/render/taglib-imports-nested/nested-import/components/list/icon-list/template.marko
@@ -1 +1 @@
-- [icon-list]
\ No newline at end of file
+-- [icon-list]
\ No newline at end of file
diff --git a/test/autotests/render/while-attr/template.marko b/test/autotests/render/while-attr/template.marko
index f8b33c2ac..30fdc4842 100644
--- a/test/autotests/render/while-attr/template.marko
+++ b/test/autotests/render/while-attr/template.marko
@@ -1,3 +1,3 @@
 var n=0
 ul
-    li while(n < 4) - ${n++}
\ No newline at end of file
+    li while(n < 4) -- ${n++}
\ No newline at end of file
diff --git a/test/autotests/render/while-tag/template.marko b/test/autotests/render/while-tag/template.marko
index f5a711773..b708a8f9c 100644
--- a/test/autotests/render/while-tag/template.marko
+++ b/test/autotests/render/while-tag/template.marko
@@ -1,4 +1,4 @@
 var n=0
 ul
   while(n < 4)
-    li - ${n++}
\ No newline at end of file
+    li -- ${n++}
\ No newline at end of file
diff --git a/test/autotests/vdom-compiler/custom-tag/expected.js b/test/autotests/vdom-compiler/custom-tag/expected.js
index 575a66ac7..df0e21a9b 100644
--- a/test/autotests/vdom-compiler/custom-tag/expected.js
+++ b/test/autotests/vdom-compiler/custom-tag/expected.js
@@ -4,7 +4,7 @@ var marko_template = module.exports = require("marko/vdom").t(__filename),
     test_hello_tag = marko_loadTag(require("./tags/test-hello/renderer")),
     marko_createElement = marko_helpers.e,
     marko_const = marko_helpers.const,
-    marko_const_nextId = marko_const("b7b61f"),
+    marko_const_nextId = marko_const("cee604"),
     marko_node0 = marko_createElement("a", {
         href: "foo"
       }, 1, marko_const_nextId())
diff --git a/test/autotests/vdom-compiler/custom-tag/template.marko b/test/autotests/vdom-compiler/custom-tag/template.marko
index 10563df05..39ee39b0c 100644
--- a/test/autotests/vdom-compiler/custom-tag/template.marko
+++ b/test/autotests/vdom-compiler/custom-tag/template.marko
@@ -1,4 +1,4 @@
 div
     test-hello name="World"
         a href="foo"
-            - Body content
\ No newline at end of file
+            -- Body content
\ No newline at end of file
diff --git a/test/autotests/vdom-compiler/no-escape/template.marko b/test/autotests/vdom-compiler/no-escape/template.marko
index 96d5a0117..2ecc6ecfc 100644
--- a/test/autotests/vdom-compiler/no-escape/template.marko
+++ b/test/autotests/vdom-compiler/no-escape/template.marko
@@ -1 +1 @@
-- Hello ${name}! $!{message}
\ No newline at end of file
+-- Hello ${name}! $!{message}
\ No newline at end of file
diff --git a/test/autotests/widgets-browser-deprecated/widget-dom-events-jquery/template.marko b/test/autotests/widgets-browser-deprecated/widget-dom-events-jquery/template.marko
index 4fe515f85..fd7d2ee69 100644
--- a/test/autotests/widgets-browser-deprecated/widget-dom-events-jquery/template.marko
+++ b/test/autotests/widgets-browser-deprecated/widget-dom-events-jquery/template.marko
@@ -1,2 +1,2 @@
 div class="app-dom-events-jquery" w-bind="./widget"
-    button type="button" w-id="button" - Button
+    button type="button" w-id="button" -- Button
diff --git a/test/autotests/widgets-browser-deprecated/widget-repeated-id-widgetless/components/app-widgetless/template.marko b/test/autotests/widgets-browser-deprecated/widget-repeated-id-widgetless/components/app-widgetless/template.marko
index 858f1a93f..3b29572e2 100644
--- a/test/autotests/widgets-browser-deprecated/widget-repeated-id-widgetless/components/app-widgetless/template.marko
+++ b/test/autotests/widgets-browser-deprecated/widget-repeated-id-widgetless/components/app-widgetless/template.marko
@@ -1 +1 @@
-- [app-widgetless]
\ No newline at end of file
+-- [app-widgetless]
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-dom-events-jquery/index.marko b/test/autotests/widgets-browser/widget-dom-events-jquery/index.marko
index 20e6a4b5a..92224364d 100644
--- a/test/autotests/widgets-browser/widget-dom-events-jquery/index.marko
+++ b/test/autotests/widgets-browser/widget-dom-events-jquery/index.marko
@@ -1,2 +1,2 @@
 div class="app-dom-events-jquery"
-    button type="button" ref="button" - Button
+    button type="button" ref="button" -- Button
diff --git a/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko
index 858f1a93f..3b29572e2 100644
--- a/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko
+++ b/test/autotests/widgets-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko
@@ -1 +1 @@
-- [app-widgetless]
\ No newline at end of file
+-- [app-widgetless]
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/async-boundaries/template.marko b/test/autotests/widgets-pages/async-boundaries/template.marko
index 60ae55d17..8dd81a2db 100644
--- a/test/autotests/widgets-pages/async-boundaries/template.marko
+++ b/test/autotests/widgets-pages/async-boundaries/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/custom-events/template.marko b/test/autotests/widgets-pages/custom-events/template.marko
index 3f5074169..d12bca4a4 100644
--- a/test/autotests/widgets-pages/custom-events/template.marko
+++ b/test/autotests/widgets-pages/custom-events/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/dom-events/components/app-foo/index.marko b/test/autotests/widgets-pages/dom-events/components/app-foo/index.marko
index d387fc59b..77c7c6d38 100644
--- a/test/autotests/widgets-pages/dom-events/components/app-foo/index.marko
+++ b/test/autotests/widgets-pages/dom-events/components/app-foo/index.marko
@@ -6,11 +6,11 @@ div
             onClick('handleButtonClick', {type: 'ok'})
             onMouseMove('handleButtonMouseMove', {type: 'ok'})
         ]
-        - OK
+        -- OK
     button [
             ref="cancel"
             type="button"
             onClick('handleButtonClick', {type: 'cancel'})
             onMouseMove('handleButtonMouseMove', {type: 'cancel'})
         ]
-        - Cancel
\ No newline at end of file
+        -- Cancel
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/dom-events/template.marko b/test/autotests/widgets-pages/dom-events/template.marko
index 3f5074169..d12bca4a4 100644
--- a/test/autotests/widgets-pages/dom-events/template.marko
+++ b/test/autotests/widgets-pages/dom-events/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/getRenderedWidgets/template.marko b/test/autotests/widgets-pages/getRenderedWidgets/template.marko
index baef95fc3..b7b06d33d 100644
--- a/test/autotests/widgets-pages/getRenderedWidgets/template.marko
+++ b/test/autotests/widgets-pages/getRenderedWidgets/template.marko
@@ -22,7 +22,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
         await(components from componentsDataProvider)
diff --git a/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/template.marko b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/template.marko
index 449d730bd..b0c5b6cc1 100644
--- a/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/template.marko
+++ b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/template.marko
@@ -13,7 +13,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/init-widgets-immediate/template.marko b/test/autotests/widgets-pages/init-widgets-immediate/template.marko
index ebbe84b41..c69c3e470 100644
--- a/test/autotests/widgets-pages/init-widgets-immediate/template.marko
+++ b/test/autotests/widgets-pages/init-widgets-immediate/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/init-widgets-tag-none/template.marko b/test/autotests/widgets-pages/init-widgets-tag-none/template.marko
index 505289cc8..948cd55f1 100644
--- a/test/autotests/widgets-pages/init-widgets-tag-none/template.marko
+++ b/test/autotests/widgets-pages/init-widgets-tag-none/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/init-widgets-tag/template.marko b/test/autotests/widgets-pages/init-widgets-tag/template.marko
index 4c420af7d..832ee3dc2 100644
--- a/test/autotests/widgets-pages/init-widgets-tag/template.marko
+++ b/test/autotests/widgets-pages/init-widgets-tag/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/server-browser-unique-ids/template.marko b/test/autotests/widgets-pages/server-browser-unique-ids/template.marko
index d7b0b46f3..1fd7eb0c4 100644
--- a/test/autotests/widgets-pages/server-browser-unique-ids/template.marko
+++ b/test/autotests/widgets-pages/server-browser-unique-ids/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/split-widget-renderer/template.marko b/test/autotests/widgets-pages/split-widget-renderer/template.marko
index 67cd77282..8d209b707 100644
--- a/test/autotests/widgets-pages/split-widget-renderer/template.marko
+++ b/test/autotests/widgets-pages/split-widget-renderer/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/widget-config/template.marko b/test/autotests/widgets-pages/widget-config/template.marko
index 3f5074169..d12bca4a4 100644
--- a/test/autotests/widgets-pages/widget-config/template.marko
+++ b/test/autotests/widgets-pages/widget-config/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/widget-fixed-id/template.marko b/test/autotests/widgets-pages/widget-fixed-id/template.marko
index ae7a8f010..05fd14ac8 100644
--- a/test/autotests/widgets-pages/widget-fixed-id/template.marko
+++ b/test/autotests/widgets-pages/widget-fixed-id/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/widget-state/template.marko b/test/autotests/widgets-pages/widget-state/template.marko
index 3f5074169..d12bca4a4 100644
--- a/test/autotests/widgets-pages/widget-state/template.marko
+++ b/test/autotests/widgets-pages/widget-state/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/autotests/widgets-pages/xss/template.marko b/test/autotests/widgets-pages/xss/template.marko
index 2582911e2..9647ff480 100644
--- a/test/autotests/widgets-pages/xss/template.marko
+++ b/test/autotests/widgets-pages/xss/template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body
 
diff --git a/test/browser-tests-runner/page-template.marko b/test/browser-tests-runner/page-template.marko
index 867de7952..5603350a7 100644
--- a/test/browser-tests-runner/page-template.marko
+++ b/test/browser-tests-runner/page-template.marko
@@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso
 html lang="en"
     head
         meta charset="UTF-8"
-        title - Marko Widgets Tests
+        title -- Marko Widgets Tests
         lasso-head
     body