diff --git a/extra/http/server/sessions/sessions-tests.factor b/extra/http/server/sessions/sessions-tests.factor
index 548f3dc00b..c95ff30069 100755
--- a/extra/http/server/sessions/sessions-tests.factor
+++ b/extra/http/server/sessions/sessions-tests.factor
@@ -7,7 +7,10 @@ sequences db db.sqlite continuations ;
 
 : with-session
     [
-        >r [ save-session-after ] [ \ session set ] bi r> call
+        >r
+        [ session-manager get swap save-session-after ]
+        [ \ session set ] bi
+        r> call
     ] with-destructors ; inline
 
 TUPLE: foo ;
diff --git a/extra/http/server/templating/chloe/chloe-tests.factor b/extra/http/server/templating/chloe/chloe-tests.factor
index cb8b56e002..61f72a2f14 100644
--- a/extra/http/server/templating/chloe/chloe-tests.factor
+++ b/extra/http/server/templating/chloe/chloe-tests.factor
@@ -4,14 +4,6 @@ io.streams.string kernel sequences ascii boxes namespaces xml
 splitting ;
 IN: http.server.templating.chloe.tests
 
-[ "foo" ]
-[ "<a href=\"foo\">blah</a>" string>xml "href" required-attr ]
-unit-test
-
-[ "<a name=\"foo\">blah</a>" string>xml "href" required-attr ]
-[ "href attribute is required" = ]
-must-fail-with
-
 [ f ] [ f parse-query-attr ] unit-test
 
 [ f ] [ "" parse-query-attr ] unit-test
diff --git a/extra/http/server/templating/chloe/test/test4.xml b/extra/http/server/templating/chloe/test/test4.xml
index 0381bcc27a..dd9b232d73 100644
--- a/extra/http/server/templating/chloe/test/test4.xml
+++ b/extra/http/server/templating/chloe/test/test4.xml
@@ -2,7 +2,7 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-	<t:if code="http.server.templating.chloe.tests:test4-aux?">
+	<t:if t:code="http.server.templating.chloe.tests:test4-aux?">
 		True
 	</t:if>
 
diff --git a/extra/http/server/templating/chloe/test/test5.xml b/extra/http/server/templating/chloe/test/test5.xml
index d74a5e5368..3bd39e45bd 100644
--- a/extra/http/server/templating/chloe/test/test5.xml
+++ b/extra/http/server/templating/chloe/test/test5.xml
@@ -2,7 +2,7 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-	<t:if code="http.server.templating.chloe.tests:test5-aux?">
+	<t:if t:code="http.server.templating.chloe.tests:test5-aux?">
 		True
 	</t:if>
 
diff --git a/extra/http/server/templating/chloe/test/test6.xml b/extra/http/server/templating/chloe/test/test6.xml
index 5b6a71cf6b..56234a5f0d 100644
--- a/extra/http/server/templating/chloe/test/test6.xml
+++ b/extra/http/server/templating/chloe/test/test6.xml
@@ -2,7 +2,7 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-	<t:if var="http.server.templating.chloe.tests:test6-aux?">
+	<t:if t:var="http.server.templating.chloe.tests:test6-aux?">
 		True
 	</t:if>
 
diff --git a/extra/http/server/templating/chloe/test/test7.xml b/extra/http/server/templating/chloe/test/test7.xml
index 4381b5cec4..a4f8e06e7d 100644
--- a/extra/http/server/templating/chloe/test/test7.xml
+++ b/extra/http/server/templating/chloe/test/test7.xml
@@ -2,7 +2,7 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-	<t:if var="http.server.templating.chloe.tests:test7-aux?">
+	<t:if t:var="http.server.templating.chloe.tests:test7-aux?">
 		True
 	</t:if>