diff --git a/test/wikitests/FirstTiddler.html b/test/wikitests/FirstTiddler.html
index e2bd4486b..7c673250e 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">SecondTiddler</a>, too.
\ 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="linkResolves">SecondTiddler</a>, too.
\ No newline at end of file
diff --git a/test/wikitests/Fourth Tiddler.html b/test/wikitests/Fourth Tiddler.html
index 210253691..1ae271547 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 2.6.5
\ 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 5.0.0
\ No newline at end of file
diff --git a/test/wikitests/Fourth Tiddler.txt b/test/wikitests/Fourth Tiddler.txt
index 6b46181d0..fa95b0513 100644
--- a/test/wikitests/Fourth Tiddler.txt	
+++ b/test/wikitests/Fourth Tiddler.txt	
@@ -1 +1 @@
-An image  and a $1 couple of Ç Ç "HTML Entity" and macro 2.6.5
\ No newline at end of file
+An image  and a $1 couple of Ç Ç "HTML Entity" and macro 5.0.0
\ No newline at end of file
diff --git a/test/wikitests/SecondTiddler.html b/test/wikitests/SecondTiddler.html
index 23966f8be..1fd7dc88a 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 2.6.5 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 5.0.0 and a <span class="myClass">custom class</span><br />
\ No newline at end of file
diff --git a/test/wikitests/SecondTiddler.txt b/test/wikitests/SecondTiddler.txt
index b2acbdf5a..9defebc87 100644
--- a/test/wikitests/SecondTiddler.txt
+++ b/test/wikitests/SecondTiddler.txt
@@ -1 +1 @@
-HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a macro invocation 2.6.5 and a custom class
\ No newline at end of file
+HeadingThis is the second tiddler. It has a list: Item one Item two Item threeAnd a macro invocation 5.0.0 and a custom class
\ No newline at end of file
diff --git a/test/wikitests/SeventhTiddler.html b/test/wikitests/SeventhTiddler.html
index c0c644dad..a510c2e83 100644
--- a/test/wikitests/SeventhTiddler.html
+++ b/test/wikitests/SeventhTiddler.html
@@ -1 +1 @@
-4<br /><br />SeventhTiddler<br /><br />{{** Evaluation error: ReferenceError: window is not defined **}}<br />
\ No newline at end of file
+4<br /><br />SeventhTiddler<br /><br />window<br />
\ No newline at end of file
diff --git a/test/wikitests/SeventhTiddler.tid b/test/wikitests/SeventhTiddler.tid
index 90d246b60..12aa1d8be 100644
--- a/test/wikitests/SeventhTiddler.tid
+++ b/test/wikitests/SeventhTiddler.tid
@@ -2,6 +2,6 @@ title: SeventhTiddler
 
 <<echo {{2+2}}>>
 
-<<echo {{"title"}}>>
+<<echo {{tiddler.fields.title}}>>
 
 <<echo {{"window"}}>>
diff --git a/test/wikitests/SeventhTiddler.txt b/test/wikitests/SeventhTiddler.txt
index 025a2c7e2..613924589 100644
--- a/test/wikitests/SeventhTiddler.txt
+++ b/test/wikitests/SeventhTiddler.txt
@@ -1 +1 @@
-4SeventhTiddler{{** Evaluation error: ReferenceError: window is not defined **}}
\ No newline at end of file
+4SeventhTiddlerwindow
\ No newline at end of file
diff --git a/test/wikitests/SixthTiddler.tid b/test/wikitests/SixthTiddler.tid
index 529507114..d4b6f02ad 100644
--- a/test/wikitests/SixthTiddler.tid
+++ b/test/wikitests/SixthTiddler.tid
@@ -3,7 +3,6 @@ modified: 20110211110621
 modifier: Jermolene
 
 <<view title>>
-<<view title wikified>>
 <<view modified date>>
 <<view modifier link>>
 <<list all>>
diff --git a/test/wikitests/ThirdTiddler.html b/test/wikitests/ThirdTiddler.html
index 41edc4007..2b385a492 100644
--- a/test/wikitests/ThirdTiddler.html
+++ b/test/wikitests/ThirdTiddler.html
@@ -1 +1 @@
-An explicit link <a href="Fourth Tiddler">Fourth Tiddler</a> and <a href="Fourth Tiddler">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 2.6.5
\ No newline at end of file
+An explicit link <a href="Fourth Tiddler" class="linkResolves">Fourth Tiddler</a> and <a href="Fourth Tiddler" class="linkResolves">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 2.6.5
\ No newline at end of file