diff --git a/library/server/request/rest/tests/src/app/app_test.e b/library/server/request/rest/tests/src/app/app_test.e
index 99aa4ba7..384de7d6 100644
--- a/library/server/request/rest/tests/src/app/app_test.e
+++ b/library/server/request/rest/tests/src/app/app_test.e
@@ -49,8 +49,8 @@ feature -- Execution
 
 			create s.make_empty
 			s.append_string ("test")
-			if attached req.meta_variable ("REQUEST_COUNT") as l_request_count_val then
-				s.append_string ("(request_count="+ l_request_count_val.as_string +")%N")
+			if attached {WSF_STRING} req.meta_variable ("REQUEST_COUNT") as l_request_count_val then
+				s.append_string ("(request_count="+ l_request_count_val.string +")%N")
 			end
 
 --			ctx.request_format_id ("format", Void)
diff --git a/library/server/request/rest/tests/src/handler/app_request_handler.e b/library/server/request/rest/tests/src/handler/app_request_handler.e
index 158c730b..450d2292 100644
--- a/library/server/request/rest/tests/src/handler/app_request_handler.e
+++ b/library/server/request/rest/tests/src/handler/app_request_handler.e
@@ -32,7 +32,7 @@ feature {NONE} -- Implementation
 			across
 				 v as cur
 			loop
-				Result.append_string (cur.item.name.as_string_8 + " = " + cur.item.as_string.as_string_8 + "%N")
+				Result.append_string (cur.item.name.as_string_8 + " = " + cur.item.string_representation.as_string_8 + "%N")
 			end
 			if using_pre then
 				Result.append ("</pre>")
diff --git a/library/server/request/router/router-safe.ecf b/library/server/request/router/router-safe.ecf
index dc39ca12..bd9b1012 100644
--- a/library/server/request/router/router-safe.ecf
+++ b/library/server/request/router/router-safe.ecf
@@ -17,21 +17,4 @@
 		<library name="uri_template" location="..\..\..\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
-	<target name="ewsgi_compliant_router">
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
-			<assertions precondition="true"/>
-		</option>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
-		<library name="wsf" location="..\..\wsf\wsf_spec-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
-		<library name="uri_template" location="..\..\..\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
-		<cluster name="src" location="src\" recursive="true"/>
-	</target>
 </system>