diff --git a/editions/test/tiddlers/tests/data/genesis-widget/DollarSigns.tid b/editions/test/tiddlers/tests/data/genesis-widget/DollarSigns.tid
index aba81a26f..8c0e6e4a3 100644
--- a/editions/test/tiddlers/tests/data/genesis-widget/DollarSigns.tid
+++ b/editions/test/tiddlers/tests/data/genesis-widget/DollarSigns.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$genesis $type="let" myvar="Kitten">(<$text text=<<myvar>>/>)</$genesis>
 <$genesis $type="let" $$myvar="Kitten">(<$text text=<<$myvar>>/>)</$genesis>
-_
++
 title: ExpectedResult
 
 <p>(Kitten)(Kitten)</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid b/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid
index 1edca2887..4ec14ce36 100644
--- a/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid
+++ b/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$genesis $type="let" $names="myvar other" $values="Kitten Donkey" myvar="Shark">(<$text text=<<myvar>>/>|<$text text=<<other>>/>)</$genesis>
 <$genesis $type="let" $names="$myvar $other" $values="Kitten Donkey" $$myvar="Shark">(<$text text=<<$myvar>>/>|<$text text=<<$other>>/>)</$genesis>
-_
++
 title: ExpectedResult
 
 <p>(Shark|Donkey)(Shark|Donkey)</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid b/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid
index 88abc84c8..110145307 100644
--- a/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid
+++ b/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid
@@ -21,11 +21,11 @@ title: Output
 (<$text text=<<$two>>/>)
 (<$text text=<<$$three>>/>)
 </$let>
-_
++
 title: Definition
 
 \whitespace trim
-_
++
 title: ExpectedResult
 
 <p>(--Elephant--)
diff --git a/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid b/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid
index ff232dad6..9052d621d 100644
--- a/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid
+++ b/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$genesis $tag="div">Mouse</$genesis>
 <$genesis $tag="div" class="tc-thing" label="Squeak">Mouse</$genesis>
-_
++
 title: ExpectedResult
 
 <p><div>Mouse</div><div class="tc-thing" label="Squeak">Mouse</div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid
index db63d7f47..19e617d68 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='Result'>
 </$transclude>
-_
++
 title: Actions
 
 \whitespace trim
@@ -21,7 +21,7 @@ title: Actions
 <$action-mywidget one="Dingo">
 	Crocodile
 </$action-mywidget>
-_
++
 title: ExpectedResult
 
 <p>Dingo</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid
index 6b204fe7c..014404d8c 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid
@@ -12,18 +12,18 @@ title: Output
 <$let test="Tiger">
 <$codeblock code=<<test>>/>
 </$let>
-_
++
 title: Definition
 
 \whitespace trim
 \function <$codeblock>(code)
 <$codeblock code={{{ [<code>addprefix[£]addsuffix[@]] }}}/>
 \end
-_
++
 title: Subject
 
 Python
-_
++
 title: ExpectedResult
 
 <p><pre><code>£Kangaroo@</code></pre><pre><code>£Python@</code></pre><pre><code>£Tiger@</code></pre></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid
index 57c980ea7..25c39bf35 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid
@@ -8,11 +8,11 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='TiddlerOne' one='Ferret'>
 </$transclude>
-_
++
 title: TiddlerZero
 
 Antelope
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -27,7 +27,7 @@ title: TiddlerOne
 <$transclude $tiddler="TiddlerZero">
 	Crocodile
 </$transclude>
-_
++
 title: ExpectedResult
 
 <p>Antelope</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid
index 86b08d239..9cc318b12 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='TiddlerOne' one='Ferret'>
 </$transclude>
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -23,7 +23,7 @@ title: TiddlerOne
 <$mywidget one="Dingo">
 	Crocodile
 </$mywidget>
-_
++
 title: ExpectedResult
 
 <p>DingoCrocodile</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid
index db603b298..63710c5c9 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='TiddlerOne'>
 </$transclude>
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -23,7 +23,7 @@ title: TiddlerOne
 <$text text="Dingo">
 	Crocodile
 </$text>
-_
++
 title: ExpectedResult
 
 <p>DingoCrocodile</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid
index 673be223f..70e1b1d09 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='TiddlerOne' one='Ferret'>
 </$transclude>
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -23,7 +23,7 @@ title: TiddlerOne
 <$mywidget $variable="Dingo">
 	Crocodile
 </$mywidget>
-_
++
 title: ExpectedResult
 
 <p>DingoCrocodile</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid b/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid
index 89d9f95fe..5fa2d12c7 100644
--- a/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid
+++ b/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid
@@ -34,7 +34,7 @@ title: Output
 		</$parameters>
 	</$value>
 </$transclude>
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -42,7 +42,7 @@ title: TiddlerOne
 	Piranha
 	<$text text=<<one>>/>
 </$parameters>
-_
++
 title: ExpectedResult
 
 <p>PiranhaFerretPiranhaFerretBadgerFerretBadgerFerret</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid
index 07cf5c316..5be4eea74 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid
@@ -11,7 +11,7 @@ title: Output
 {{TiddlerOne|Butterfly|Moth}}
 {{TiddlerOne|Beetle|Scorpion|Snake}}
 {{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}}
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -19,13 +19,13 @@ title: TiddlerOne
 <$list filter="[enlist<paramNames>]" counter="counter">
 {<$text text={{{ [enlist<paramNames>nth<counter>] }}}/>:<$text text={{{ [enlist<paramValues>nth<counter>] }}}/>}
 </$list>
-_
++
 title: TiddlerTwo
 
 \whitespace trim
 \parameters(zero:'Mouse',one:'Horse',two:'Owl')
 (<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>)
-_
++
 title: ExpectedResult
 
 <p></p><p>{0:Ferret}</p><p>{0:Butterfly}{1:Moth}</p><p>{0:Beetle}{1:Scorpion}{2:Snake}</p><p>({zero:Beetle}{one:Scorpion}{two:Snake})</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid
index b4b3eac0c..abf444adb 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid
@@ -11,19 +11,19 @@ title: Output
 {{TiddlerOne|Butterfly|Moth}}
 {{TiddlerOne|Beetle|Scorpion|Snake}}
 {{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}}
-_
++
 title: TiddlerOne
 
 \whitespace trim
 \parameters(zero:Jaguar,one:'Lizard',two:'Mole')
 [{<$text text=<<zero>>/>}{<$text text=<<one>>/>}{<$text text=<<two>>/>}]
-_
++
 title: TiddlerTwo
 
 \whitespace trim
 \parameters(zero:'Mouse',one:Horse,two:'Owl')
 (<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>)
-_
++
 title: ExpectedResult
 
 <p>[{Jaguar}{Lizard}{Mole}]</p><p>[{Ferret}{Lizard}{Mole}]</p><p>[{Butterfly}{Moth}{Mole}]</p><p>[{Beetle}{Scorpion}{Snake}]</p><p>([{Beetle}{Scorpion}{Snake}])</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid
index 6f37d4797..7792e6c66 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid
@@ -11,19 +11,19 @@ title: Output
 {{TiddlerOne|Butterfly|Moth}}
 {{TiddlerOne|Beetle|Scorpion|Snake}}
 {{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}}
-_
++
 title: TiddlerOne
 
 \whitespace trim
 <$parameters zero='Jaguar' one='Lizard' two='Mole'>[{<$text text=<<zero>>/>}{<$text text=<<one>>/>}{<$text text=<<two>>/>}]</$parameters>
-_
++
 title: TiddlerTwo
 
 \whitespace trim
 <$parameters zero='Mouse' one='Horse' two='Owl'>
 (<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>)
 </$parameters>
-_
++
 title: ExpectedResult
 
 <p>[{Jaguar}{Lizard}{Mole}]</p><p>[{Ferret}{Lizard}{Mole}]</p><p>[{Butterfly}{Moth}{Mole}]</p><p>[{Beetle}{Scorpion}{Snake}]</p><p>([{Beetle}{Scorpion}{Snake}])</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid
index caaa3a6ef..d7eb9090e 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid
@@ -13,14 +13,14 @@ title: Output
 <$transclude $tiddler='TiddlerOne' zero='Ferret' 0='Pigeon'/>
 <$transclude zero='Ferret' 0='Pigeon' $tiddler='TiddlerOne'/>
 <$transclude $tiddler='TiddlerOne'/>
-_
++
 title: TiddlerOne
 
 \whitespace trim
 <$parameters zero='Jaguar'>
 	<$text text=<<zero>>/>
 </$parameters>
-_
++
 title: ExpectedResult
 
 <p>FerretFerretPigeonPigeonFerretFerretJaguar</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid
index 841718ee9..375964199 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid
@@ -8,13 +8,13 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='TiddlerOne' one='Ferret'/>
 <$transclude $tiddler='TiddlerOne'/>
-_
++
 title: TiddlerOne
 
 \whitespace trim
 \parameters(one:'Jaguar')
 <$text text=<<one>>/>
-_
++
 title: ExpectedResult
 
 <p>FerretJaguar</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid
index a183fe2d4..88017392e 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid
@@ -12,7 +12,7 @@ title: Output
 
 <$transclude $variable='test' one='Ferret'/>
 <$transclude $variable='test'/>
-_
++
 title: ExpectedResult
 
 <p>{Ferret}{Jaguar}</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid
index e05e3bec4..a6228d625 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid
@@ -8,14 +8,14 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='TiddlerOne' one='Ferret'/>
 <$transclude $tiddler='TiddlerOne'/>
-_
++
 title: TiddlerOne
 
 \whitespace trim
 <$parameters one='Jaguar'>
 	<$text text=<<one>>/>
 </$parameters>
-_
++
 title: ExpectedResult
 
 <p>FerretJaguar</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid
index 983cdd5b5..fe399d572 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid
@@ -8,7 +8,7 @@ title: Output
 \whitespace trim
 <$transclude $tiddler='TiddlerOne' one='Ferret'>
 </$transclude>
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -18,7 +18,7 @@ title: TiddlerOne
 		Whale
 	</$slot>
 </$parameters>
-_
++
 title: ExpectedResult
 
 <p>FerretWhale</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid
index fa2ede489..eeff9b33e 100644
--- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid
+++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid
@@ -11,7 +11,7 @@ title: Output
 		Hippopotamus
 	</$value>
 </$transclude>
-_
++
 title: TiddlerOne
 
 \whitespace trim
@@ -21,7 +21,7 @@ title: TiddlerOne
 		Whale
 	</$slot>
 </$parameters>
-_
++
 title: ExpectedResult
 
 <p>FerretHippopotamus</p>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/jasmine/run-wiki-based-tests.js b/plugins/tiddlywiki/jasmine/run-wiki-based-tests.js
index 17033af15..4db3e232f 100644
--- a/plugins/tiddlywiki/jasmine/run-wiki-based-tests.js
+++ b/plugins/tiddlywiki/jasmine/run-wiki-based-tests.js
@@ -49,7 +49,7 @@ describe("Wiki-based tests", function() {
 	});
 
 	function readMultipleTiddlersTiddler(title) {
-		var rawTiddlers = $tw.wiki.getTiddlerText(title).split("\n_\n");
+		var rawTiddlers = $tw.wiki.getTiddlerText(title).split("\n+\n");
 		var tiddlers = [];
 		$tw.utils.each(rawTiddlers,function(rawTiddler) {
 			var fields = Object.create(null),