diff --git a/t/Asset/Wobject/Poll.t b/t/Asset/Wobject/Poll.t
index 9e622fc02..f70aab16c 100644
--- a/t/Asset/Wobject/Poll.t
+++ b/t/Asset/Wobject/Poll.t
@@ -53,6 +53,7 @@ skip "Unable to load module $class", $tests unless $loaded;
 my $defaultNode = WebGUI::Asset->getDefault($session);
 my $template = $defaultNode->addChild({
     className => 'WebGUI::Asset::Template',
+    parser    => 'WebGUI::Asset::Template::HTMLTemplate',
     title     => 'test poll template',
     template  => q|
 {
diff --git a/t/Asset/Wobject/Search/searchroot.t b/t/Asset/Wobject/Search/searchroot.t
index 0a4512ebe..c9dd68dc6 100644
--- a/t/Asset/Wobject/Search/searchroot.t
+++ b/t/Asset/Wobject/Search/searchroot.t
@@ -39,6 +39,7 @@ my $defaultArticle = $default->addChild({
 });
 my $template = $node->addChild({
     className  => 'WebGUI::Asset::Template',
+    parser    => 'WebGUI::Asset::Template::HTMLTemplate',
     template   => qq{[<tmpl_loop result_set>"<tmpl_var assetId>"<tmpl_unless __LAST__>,</tmpl_unless></tmpl_loop>]},
 });
 my $search = $default->addChild({
diff --git a/t/Asset/Wobject/Shelf.t b/t/Asset/Wobject/Shelf.t
index b6b79da50..222d07880 100644
--- a/t/Asset/Wobject/Shelf.t
+++ b/t/Asset/Wobject/Shelf.t
@@ -510,6 +510,7 @@ SKIP: {
 
     my $testTemplate = $root->addChild({
         className => 'WebGUI::Asset::Template',
+        parser    => 'WebGUI::Asset::Template::HTMLTemplate',
         template  => q|{ "noViewableSkus":"<tmpl_var noViewableSkus>","emptyShelf":"<tmpl_var emptyShelf>"}|,
     });
     my $testShelf = $root->addChild({
diff --git a/t/Macro/EditableToggle.t b/t/Macro/EditableToggle.t
index c990bea52..4f868a2ca 100644
--- a/t/Macro/EditableToggle.t
+++ b/t/Macro/EditableToggle.t
@@ -254,6 +254,7 @@ sub setupTest {
 	my $properties = {
 		title => 'EditableToggle test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'editabletoggle-test',
 		namespace => 'Macro/EditableToggle',
 		template => "HREF=<tmpl_var toggle.url>\nLABEL=<tmpl_var toggle.text>",
diff --git a/t/Macro/GroupAdd.t b/t/Macro/GroupAdd.t
index 8e9bcd6c8..90b3374d1 100644
--- a/t/Macro/GroupAdd.t
+++ b/t/Macro/GroupAdd.t
@@ -160,6 +160,7 @@ sub setupTest {
 	my $properties = {
 		title     => 'GroupAdd test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url       => 'groupadd-test',
 		namespace => 'Macro/GroupAdd',
 		template  => qq|{"HREF":"<tmpl_var group.url>",\n"LABEL":"<tmpl_var group.text>"}|,
diff --git a/t/Macro/GroupDelete.t b/t/Macro/GroupDelete.t
index eb3803a80..1abe6d26d 100644
--- a/t/Macro/GroupDelete.t
+++ b/t/Macro/GroupDelete.t
@@ -159,6 +159,7 @@ sub setupTest {
 	my $properties = {
 		title => 'GroupDelete test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'groupdelete-test',
 		namespace => 'Macro/GroupDelete',
 		template => "HREF=<tmpl_var group.url>\nLABEL=<tmpl_var group.text>",
diff --git a/t/Macro/H_homeLink.t b/t/Macro/H_homeLink.t
index 6aad1723e..ac7a0dcf7 100644
--- a/t/Macro/H_homeLink.t
+++ b/t/Macro/H_homeLink.t
@@ -97,6 +97,7 @@ sub addTemplate {
 	my $properties = {
 		title => 'H_homeLink test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'h_homelink-test',
 		namespace => 'Macro/H_homeLink',
 		template => "HREF=<tmpl_var homeLink.url>\nLABEL=<tmpl_var homeLink.text>",
diff --git a/t/Macro/L_loginBox.t b/t/Macro/L_loginBox.t
index b66e0a198..b7a1e4a27 100644
--- a/t/Macro/L_loginBox.t
+++ b/t/Macro/L_loginBox.t
@@ -207,6 +207,7 @@ sub setupTest {
 	my $properties = {
 		title => 'L_loginBox test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'L-loginbox-test',
 		namespace => 'Macro/L_loginBox',
 		groupIdEdit => 3,
diff --git a/t/Macro/LoginToggle.t b/t/Macro/LoginToggle.t
index c5940941a..d96fdef54 100644
--- a/t/Macro/LoginToggle.t
+++ b/t/Macro/LoginToggle.t
@@ -186,6 +186,7 @@ sub setupTest {
 	my $properties = {
 		title => 'LoginToggle test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'editabletoggle-test',
 		namespace => 'Macro/LoginToggle',
 		template => "HREF=<tmpl_var toggle.url>\nLABEL=<tmpl_var toggle.text>",
diff --git a/t/Macro/MiniCart.t b/t/Macro/MiniCart.t
index 02f723784..f4e66f541 100644
--- a/t/Macro/MiniCart.t
+++ b/t/Macro/MiniCart.t
@@ -142,6 +142,6 @@ sub setupJSONtemplate {
     ]
     }
 EOTMPL
-    my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', namespace => 'Shop/MiniCart', template=>$templateBody});
+    my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', parser => 'WebGUI::Asset::Template::HTMLTemplate', namespace => 'Shop/MiniCart', template=>$templateBody});
     return $template;
 }
diff --git a/t/Macro/UsersOnline.t b/t/Macro/UsersOnline.t
index c64e6e32b..7bd6e14d6 100644
--- a/t/Macro/UsersOnline.t
+++ b/t/Macro/UsersOnline.t
@@ -234,7 +234,7 @@ sub setupJSONtemplate {
     ]	
     }
 EOTMPL
-    my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', namespace => 'Macro/UsersOnline', template=>$templateBody});
+    my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', parser => 'WebGUI::Asset::Template::HTMLTemplate', namespace => 'Macro/UsersOnline', template=>$templateBody});
     addToCleanup($template);
     return $template;
 }
diff --git a/t/Macro/a_account.t b/t/Macro/a_account.t
index ad9154357..d0ee0e1ef 100644
--- a/t/Macro/a_account.t
+++ b/t/Macro/a_account.t
@@ -90,6 +90,7 @@ sub addTemplate {
 	my $properties = {
 		title => 'a_account test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'a_account-test',
 		namespace => 'Macro/a_account',
 		template => "HREF=<tmpl_var account.url>\nLABEL=<tmpl_var account.text>",
diff --git a/t/Macro/r_printable.t b/t/Macro/r_printable.t
index adf721d57..d13be8562 100644
--- a/t/Macro/r_printable.t
+++ b/t/Macro/r_printable.t
@@ -116,6 +116,7 @@ sub setupTest {
 	my $properties = {
 		title => 'printable test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'printable-test',
 		namespace => 'Macro/r_printable',
 		template => "HREF=<tmpl_var printable.url>\nLABEL=<tmpl_var printable.text>",
diff --git a/t/Session/Privilege.t b/t/Session/Privilege.t
index 76db8dde1..9e127c2a6 100644
--- a/t/Session/Privilege.t
+++ b/t/Session/Privilege.t
@@ -134,6 +134,7 @@ sub setup_assets {
 	my $properties = {
 		title => 'user template for printing',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'user_style_printable',
 		namespace => 'Style',
 		##Note, at this point 
diff --git a/t/Session/Style.t b/t/Session/Style.t
index 3a581a427..457fe9f40 100644
--- a/t/Session/Style.t
+++ b/t/Session/Style.t
@@ -474,6 +474,7 @@ sub setup_assets {
 	my $properties = {
 		title => 'personal style test template',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'personal_style',
 		namespace => 'Style',
 		template => "PERSONAL STYLE TEMPLATE\n\nBODY=<tmpl_var body.content>\n\nHEAD=<tmpl_var head.tags>",
@@ -484,6 +485,7 @@ sub setup_assets {
 	$properties = {
 		title => 'personal style test template with extraHeadTags',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'headblock_style',
 		namespace => 'Style',
 		template => 'HEADBLOCK STYLE TEMPLATE\n\nBODY=<tmpl_var body.content>\n\nHEAD=<tmpl_var head.tags>',
@@ -495,6 +497,7 @@ sub setup_assets {
 	$properties = {
 		title => 'personal style test template for printing',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'personal_style_printable',
 		namespace => 'Style',
 		##Note, at this point 
@@ -506,6 +509,7 @@ sub setup_assets {
 	$properties = {
 		title => 'asset template for printing',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'asset_style_printable',
 		namespace => 'Style',
 		##Note, at this point 
@@ -517,6 +521,7 @@ sub setup_assets {
 	$properties = {
 		title => 'user template for printing',
 		className => 'WebGUI::Asset::Template',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'user_style_printable',
 		namespace => 'Style',
 		##Note, at this point 
@@ -528,6 +533,7 @@ sub setup_assets {
 	$properties = {
 		title => 'asset for printing',
 		className => 'WebGUI::Asset::Wobject::Article',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'printable_article',
 		id => 'printableAsset00000000',
 		printableStyleTemplateId => $templates->{asset}->getId,
@@ -540,6 +546,7 @@ sub setup_assets {
 	$properties = {
 		title => 'Daddy Snippet',
 		className => 'WebGUI::Asset::Snippet',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'daddy_snippet',
 		id => 'printableSnippet0Daddy',
 		#     '1234567890123456789012'
@@ -549,6 +556,7 @@ sub setup_assets {
 	$properties = {
 		title => 'My Snippet',
 		className => 'WebGUI::Asset::Snippet',
+		parser    => 'WebGUI::Asset::Template::HTMLTemplate',
 		url => 'printable_snippet',
 		id => 'printableSnippet123456',
 		#     '1234567890123456789012'