diff --git a/test/wikitests/Fifth Tiddler.html b/test/wikitests/Fifth Tiddler.html
index 0343a7a72..172697b27 100644
--- a/test/wikitests/Fifth Tiddler.html	
+++ b/test/wikitests/Fifth Tiddler.html	
@@ -1 +1 @@
-<table class='twtable'><caption align='top'>A caption above the table</caption><thead><tr class='evenRow'><td align='center'>Left</td><td align='center'>Middle</td><td align='center'>Right</td></tr></thead><tbody><tr class='oddRow'><td>North West</td><td>North</td><td>North East</td></tr><tr class='evenRow'><td>West</td><td>Here</td><td>East</td></tr><tr class='oddRow'><td>South West</td><td>South</td><td>South East</td></tr></tbody></table>
\ No newline at end of file
+<div data-tw-render-tiddler='Fifth Tiddler'><table class='twtable'><caption align='top'>A caption above the table</caption><thead><tr class='evenRow'><td align='center'>Left</td><td align='center'>Middle</td><td align='center'>Right</td></tr></thead><tbody><tr class='oddRow'><td>North West</td><td>North</td><td>North East</td></tr><tr class='evenRow'><td>West</td><td>Here</td><td>East</td></tr><tr class='oddRow'><td>South West</td><td>South</td><td>South East</td></tr></tbody></table></div>
\ No newline at end of file
diff --git a/test/wikitests/FirstTiddler.html b/test/wikitests/FirstTiddler.html
index c1c5f9329..01cca699b 100644
--- a/test/wikitests/FirstTiddler.html
+++ b/test/wikitests/FirstTiddler.html
@@ -1 +1 @@
-This is the <strong>text</strong> of the first tiddler, with a <span style='font-size:8em;color:red;'>link</span> to the <span data-tw-macro='link'><a href='SecondTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SecondTiddler</a></span>, too. And a link to <span data-tw-macro='link'><a href='http://tiddlywiki.com/' class='tw-tiddlylink tw-tiddlylink-external'>http://tiddlywiki.com/</a></span>.<br />
\ No newline at end of file
+<div data-tw-render-tiddler='FirstTiddler'>This is the <strong>text</strong> of the first tiddler, with a <span style='font-size:8em;color:red;'>link</span> to the <span data-tw-macro='link' data-tw-render-step='1'><a href='SecondTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SecondTiddler</a></span>, too. And a link to <span data-tw-macro='link' data-tw-render-step='2'><a href='http://tiddlywiki.com/' class='tw-tiddlylink tw-tiddlylink-external'>http://tiddlywiki.com/</a></span>.<br></div>
\ No newline at end of file
diff --git a/test/wikitests/Fourth Tiddler.html b/test/wikitests/Fourth Tiddler.html
index 08ebf0529..6bd2c4f21 100644
--- a/test/wikitests/Fourth Tiddler.html	
+++ b/test/wikitests/Fourth Tiddler.html	
@@ -1 +1 @@
-An image <div data-tw-macro='image'><img href='Something.jpg' /></div> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version'>5.0.0</div>
\ No newline at end of file
+<div data-tw-render-tiddler='Fourth Tiddler'>An image <div data-tw-macro='image' data-tw-render-step='1'><img href='Something.jpg'></div> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version' data-tw-render-step='2'>5.0.0</div></div>
\ No newline at end of file
diff --git a/test/wikitests/SecondTiddler.html b/test/wikitests/SecondTiddler.html
index 1b864000e..4767b5b10 100644
--- a/test/wikitests/SecondTiddler.html
+++ b/test/wikitests/SecondTiddler.html
@@ -1 +1 @@
-<h2>Heading</h2>This is the second tiddler. It has a list:<br /><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a macro invocation <div data-tw-macro='version'>5.0.0</div> and a <span class='myClass'>custom class</span><br />
\ No newline at end of file
+<div data-tw-render-tiddler='SecondTiddler'><h2>Heading</h2>This is the second tiddler. It has a list:<br><ul><li> Item one</li><li> Item two</li><li> Item three</li></ul>And a macro invocation <div data-tw-macro='version' data-tw-render-step='1'>5.0.0</div> and a <span class='myClass'>custom class</span><br></div>
\ No newline at end of file
diff --git a/test/wikitests/SeventhTiddler.html b/test/wikitests/SeventhTiddler.html
index fd437ce67..9eb718a6e 100644
--- a/test/wikitests/SeventhTiddler.html
+++ b/test/wikitests/SeventhTiddler.html
@@ -1 +1 @@
-<div data-tw-macro='echo'>4</div><br /><br /><div data-tw-macro='echo'>SeventhTiddler</div><br /><br /><div data-tw-macro='echo'>window</div><br />
\ No newline at end of file
+<div data-tw-render-tiddler='SeventhTiddler'><div data-tw-macro='echo' data-tw-render-step='1'>4</div><br><br><div data-tw-macro='echo' data-tw-render-step='2'>SeventhTiddler</div><br><br><div data-tw-macro='echo' data-tw-render-step='3'>window</div><br></div>
\ No newline at end of file
diff --git a/test/wikitests/SixthTiddler.html b/test/wikitests/SixthTiddler.html
index 1c6002671..982b5e41d 100644
--- a/test/wikitests/SixthTiddler.html
+++ b/test/wikitests/SixthTiddler.html
@@ -1 +1 @@
-<div data-tw-macro='view'>SixthTiddler</div><br /><div data-tw-macro='view'>11 February 2011</div><br /><div data-tw-macro='view'><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a></div><br /><div data-tw-macro='list'><ul><li><div data-tw-macro='view'><a href='Fifth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fifth Tiddler</a></div></li><li><div data-tw-macro='view'><a href='FirstTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>FirstTiddler</a></div></li><li><div data-tw-macro='view'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a></div></li><li><div data-tw-macro='view'><a href='SecondTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SecondTiddler</a></div></li><li><div data-tw-macro='view'><a href='SeventhTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SeventhTiddler</a></div></li><li><div data-tw-macro='view'><a href='SixthTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SixthTiddler</a></div></li><li><div data-tw-macro='view'><a href='ThirdTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>ThirdTiddler</a></div></li></ul></div><br />
\ No newline at end of file
+<div data-tw-render-tiddler='SixthTiddler'><div data-tw-macro='view' data-tw-render-step='1'>SixthTiddler</div><br><div data-tw-macro='view' data-tw-render-step='2'>11 February 2011</div><br><div data-tw-macro='view' data-tw-render-step='3'><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a></div><br><div data-tw-macro='list' data-tw-render-step='4'><ul><li><div data-tw-macro='view' data-tw-render-step='1'><a href='Fifth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fifth Tiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='FirstTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>FirstTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='SecondTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SecondTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='SeventhTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SeventhTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='SixthTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SixthTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='ThirdTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>ThirdTiddler</a></div></li></ul></div><br></div>
\ No newline at end of file
diff --git a/test/wikitests/ThirdTiddler.html b/test/wikitests/ThirdTiddler.html
index 694a1ba68..428019157 100644
--- a/test/wikitests/ThirdTiddler.html
+++ b/test/wikitests/ThirdTiddler.html
@@ -1 +1 @@
-An explicit link <span data-tw-macro='link'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a></span> and <span data-tw-macro='link'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>a pretty link</a></span> and a transclusion <div data-tw-macro='tiddler'>An image <div data-tw-macro='image'><img href='Something.jpg' /></div> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version'>5.0.0</div></div><br /><br /><div data-tw-macro='image'><img href='http://placehold.it/350x150' /></div><br />
\ No newline at end of file
+<div data-tw-render-tiddler='ThirdTiddler'>An explicit link <span data-tw-macro='link' data-tw-render-step='1'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a></span> and <span data-tw-macro='link' data-tw-render-step='2'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>a pretty link</a></span> and a transclusion <div data-tw-macro='tiddler' data-tw-render-step='3'>An image <div data-tw-macro='image' data-tw-render-step='1'><img href='Something.jpg'></div> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version' data-tw-render-step='2'>5.0.0</div></div><br><br><div data-tw-macro='image' data-tw-render-step='4'><img href='http://placehold.it/350x150'></div><br></div>
\ No newline at end of file