diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid
index bddaaad44..db63d7f47 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid
@@ -13,15 +13,14 @@ title: Actions
 
 \whitespace trim
 <!-- Define the <$action-mywidget> widget by defining a transcludable variable with that name -->
-<$set name="<$action-mywidget>" value="""\whitespace trim
-	<$parameters one='Jaguar'>
-		<$action-setfield $tiddler="Result" $field="text" $value=<<one>>/>
-	</$parameters>"""
->
-	<$action-mywidget one="Dingo">
-		Crocodile
-	</$action-mywidget>
-</$set>
+\function <$action-mywidget>(one:'Jaguar')
+\whitespace trim
+<$action-setfield $tiddler="Result" $field="text" $value=<<one>>/>
+\end
+
+<$action-mywidget one="Dingo">
+	Crocodile
+</$action-mywidget>
 _
 title: ExpectedResult
 
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideUbertransclude.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideUbertransclude.tid
index 0cbc18b97..57c980ea7 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideUbertransclude.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideUbertransclude.tid
@@ -17,18 +17,16 @@ title: TiddlerOne
 
 \whitespace trim
 <!-- Redefine the <$transclude> widget by defining a transcludable variable with that name -->
-<$set name="<$transclude>" value="""\whitespace trim
-	<$parameters one='Jaguar'>
-		<$text text=<<one>>/>
-		<$slot $name="body">
-			Whale
-		</$slot>
-	</$parameters>"""
->
-	<$transclude $tiddler="TiddlerZero">
-		Crocodile
-	</$transclude>
-</$set>
+\function <$transclude>(one:'Jaguar')
+\whitespace trim
+	<$text text=<<one>>/>
+	<$slot $name="body">
+		Whale
+	</$slot>
+\end
+<$transclude $tiddler="TiddlerZero">
+	Crocodile
+</$transclude>
 _
 title: ExpectedResult
 
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid
index 07db9d99b..86b08d239 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid
@@ -13,18 +13,16 @@ title: TiddlerOne
 
 \whitespace trim
 <!-- Define the <$mywidget> widget by defining a transcludable variable with that name -->
-<$set name="<$mywidget>" value="""\whitespace trim
-	<$parameters one='Jaguar'>
-		<$text text=<<one>>/>
-		<$slot $name="ts-body">
-			Whale
-		</$slot>
-	</$parameters>"""
->
-	<$mywidget one="Dingo">
-		Crocodile
-	</$mywidget>
-</$set>
+\function <$mywidget>(one:'Jaguar')
+\whitespace trim
+<$text text=<<one>>/>
+<$slot $name="ts-body">
+	Whale
+</$slot>
+\end
+<$mywidget one="Dingo">
+	Crocodile
+</$mywidget>
 _
 title: ExpectedResult
 
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid
index fd4660809..db603b298 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid
@@ -13,18 +13,16 @@ title: TiddlerOne
 
 \whitespace trim
 <!-- Redefine the <$text> widget by defining a transcludable variable with that name -->
-<$set name="<$text>" value="""\whitespace trim
-	<$parameters text='Jaguar'>
-		<$text text=<<text>>/>
-		<$slot $name="ts-body">
-			Whale
-		</$slot>
-	</$parameters>"""
->
-	<$text text="Dingo">
-		Crocodile
-	</$text>
-</$set>
+\function <$text>(text:'Jaguar')
+\whitespace trim
+<$text text=<<text>>/>
+<$slot $name="ts-body">
+	Whale
+</$slot>
+\end
+<$text text="Dingo">
+	Crocodile
+</$text>
 _
 title: ExpectedResult
 
diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid
index 3f0a1b4b7..673be223f 100644
--- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid
+++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid
@@ -13,18 +13,16 @@ title: TiddlerOne
 
 \whitespace trim
 <!-- Redefine the <$mywidget> widget by defining a transcludable variable with that name -->
-<$set name="<$mywidget>" value="""\whitespace trim
-	<$parameters $variable='Jaguar'>
-		<$text text=<<$variable>>/>
-		<$slot $name="ts-body">
-			Whale
-		</$slot>
-	</$parameters>"""
->
-	<$mywidget $variable="Dingo">
-		Crocodile
-	</$mywidget>
-</$set>
+\function <$mywidget>($variable:'Jaguar')
+\whitespace trim
+<$text text=<<$variable>>/>
+<$slot $name="ts-body">
+	Whale
+</$slot>
+\end
+<$mywidget $variable="Dingo">
+	Crocodile
+</$mywidget>
 _
 title: ExpectedResult