diff --git a/test/wikitests/FirstTiddler.html b/test/wikitests/FirstTiddler.html
index b83a9af5b..32b642ad5 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 <a href="SecondTiddler" class="linkInternalResolves">SecondTiddler</a>, too. And a link to <a href="http://tiddlywiki.com/" class="linkExternal">http://tiddlywiki.com/</a>.<br />
\ No newline at end of file
+This is the <strong>text</strong> of the first tiddler, with a <span style="font-size:8em;color:red;">link</span> to the <a href="SecondTiddler" class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves">SecondTiddler</a>, too. And a link to <a href="http://tiddlywiki.com/" class="tw-tiddlylink tw-tiddlylink-external">http://tiddlywiki.com/</a>.<br />
\ No newline at end of file
diff --git a/test/wikitests/Fourth Tiddler.html b/test/wikitests/Fourth Tiddler.html
index 1ae271547..e276997b2 100644
--- a/test/wikitests/Fourth Tiddler.html	
+++ b/test/wikitests/Fourth Tiddler.html	
@@ -1 +1 @@
-An image <img src="Something.jpg" /> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro 5.0.0
\ No newline at end of file
+An image <img src="Something.jpg" /> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version' data-tw-params='{}'>5.0.0</div>
\ No newline at end of file
diff --git a/test/wikitests/SecondTiddler.html b/test/wikitests/SecondTiddler.html
index 1fd7dc88a..8b8a43fa8 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 5.0.0 and a <span class="myClass">custom class</span><br />
\ No newline at end of file
+<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-params='{}'>5.0.0</div> and a <span class="myClass">custom class</span><br />
\ No newline at end of file
diff --git a/test/wikitests/SeventhTiddler.html b/test/wikitests/SeventhTiddler.html
index a510c2e83..d268e7a1d 100644
--- a/test/wikitests/SeventhTiddler.html
+++ b/test/wikitests/SeventhTiddler.html
@@ -1 +1 @@
-4<br /><br />SeventhTiddler<br /><br />window<br />
\ No newline at end of file
+<div data-tw-macro='echo' data-tw-params='{&quot;text&quot;:{&quot;type&quot;:&quot;eval&quot;,&quot;value&quot;:&quot;2+2&quot;}}'>4</div><br /><br /><div data-tw-macro='echo' data-tw-params='{&quot;text&quot;:{&quot;type&quot;:&quot;eval&quot;,&quot;value&quot;:&quot;tiddler.fields.title&quot;}}'>SeventhTiddler</div><br /><br /><div data-tw-macro='echo' data-tw-params='{&quot;text&quot;:{&quot;type&quot;:&quot;eval&quot;,&quot;value&quot;:&quot;\&quot;window\&quot;&quot;}}'>window</div><br />
\ No newline at end of file
diff --git a/test/wikitests/SixthTiddler.html b/test/wikitests/SixthTiddler.html
index fb759efaa..cc19b15cd 100644
--- a/test/wikitests/SixthTiddler.html
+++ b/test/wikitests/SixthTiddler.html
@@ -1 +1 @@
-SixthTiddler<br />11 February 2011<br /><a href='Jermolene' class="linkInternalMissing">Jermolene</a><br /><ul><li><a href='Fifth Tiddler' class="linkInternalResolves">Fifth Tiddler</a></li><li><a href='FirstTiddler' class="linkInternalResolves">FirstTiddler</a></li><li><a href='Fourth Tiddler' class="linkInternalResolves">Fourth Tiddler</a></li><li><a href='SecondTiddler' class="linkInternalResolves">SecondTiddler</a></li><li><a href='SeventhTiddler' class="linkInternalResolves">SeventhTiddler</a></li><li><a href='SixthTiddler' class="linkInternalResolves">SixthTiddler</a></li><li><a href='ThirdTiddler' class="linkInternalResolves">ThirdTiddler</a></li></ul><br />
\ No newline at end of file
+<div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;}}'>SixthTiddler</div><br /><div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;modified&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;date&quot;}}'>11 February 2011</div><br /><div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;modifier&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><a href='Jermolene' class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing">Jermolene</a></div><br /><div data-tw-macro='list' data-tw-params='{&quot;type&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;all&quot;}}'><ul><li><div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><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-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><a href='FirstTiddler' class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves">FirstTiddler</a></div></li><li><div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><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-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><a href='SecondTiddler' class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves">SecondTiddler</a></div></li><li><div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><a href='SeventhTiddler' class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves">SeventhTiddler</a></div></li><li><div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><a href='SixthTiddler' class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves">SixthTiddler</a></div></li><li><div data-tw-macro='view' data-tw-params='{&quot;field&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;title&quot;},&quot;format&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;link&quot;}}'><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
diff --git a/test/wikitests/ThirdTiddler.html b/test/wikitests/ThirdTiddler.html
index 45a4ecc08..ead49252c 100644
--- a/test/wikitests/ThirdTiddler.html
+++ b/test/wikitests/ThirdTiddler.html
@@ -1 +1 @@
-An explicit link <a href="Fourth Tiddler" class="linkInternalResolves">Fourth Tiddler</a> and <a href="Fourth Tiddler" class="linkInternalResolves">a pretty link</a> and a transclusion An image <img src="Something.jpg" /> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro 5.0.0
\ No newline at end of file
+An explicit link <a href="Fourth Tiddler" class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves">Fourth Tiddler</a> and <a href="Fourth Tiddler" class="tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves">a pretty link</a> and a transclusion <div data-tw-macro='tiddler' data-tw-params='{&quot;target&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;Fourth Tiddler&quot;},&quot;with&quot;:{&quot;type&quot;:&quot;string&quot;,&quot;value&quot;:&quot;Stringy&quot;}}'>An image <img src="Something.jpg" /> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version' data-tw-params='{}'>5.0.0</div></div>
\ No newline at end of file