diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf
index 2fcb5f33..8115909e 100644
--- a/tests/all-safe.ecf
+++ b/tests/all-safe.ecf
@@ -12,7 +12,6 @@
 		</option>
 		<library name="atom" location="..\draft\library\protocol\syndication\atom\atom-safe.ecf" readonly="false"/>
 		<library name="client" location="..\examples\restbucksCRUD\client\client-safe.ecf" readonly="false"/>
-		<library name="cms" location="..\draft\application\cms\cms-safe.ecf" readonly="false"/>
 		<library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>
 		<library name="connector_libfcgi" location="..\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
 		<library name="connector_nino" location="..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
@@ -22,7 +21,6 @@
 		<library name="default_libfcgi" location="..\library\server\wsf\default\libfcgi-safe.ecf" readonly="false"/>
 		<library name="default_nino" location="..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
 		<library name="default_openshift" location="..\library\server\wsf\default\openshift-safe.ecf" readonly="false"/>
-		<library name="demo" location="..\draft\application\cms\example\cms_demo-safe.ecf" readonly="false"/>
 		<library name="demo-1" location="..\library\security\openid\consumer\demo\demo-safe.ecf" readonly="false"/>
 		<library name="encoder" location="..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="error" location="..\library\utility\general\error\error-safe.ecf" readonly="false"/>
diff --git a/tests/all-stable-safe.ecf b/tests/all-stable-safe.ecf
index 3af09a8a..eb3bf311 100644
--- a/tests/all-stable-safe.ecf
+++ b/tests/all-stable-safe.ecf
@@ -10,8 +10,6 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
-		<library name="cms" location="..\draft\application\cms\cms-safe.ecf" readonly="false"/>
-		<library name="demo" location="..\draft\application\cms\example\cms_demo-safe.ecf" readonly="false"/>
 		<library name="restbucks" location="..\examples\restbucksCRUD\restbucks-safe.ecf" readonly="false"/>
 		<library name="client" location="..\examples\restbucksCRUD\client\client-safe.ecf" readonly="false"/>
 		<library name="upload_image" location="..\examples\upload_image\upload_image-safe.ecf" readonly="false"/>
@@ -21,7 +19,6 @@
 		<library name="openid" location="..\library\security\openid\consumer\openid-safe.ecf" readonly="false"/>
 		<library name="demo-1" location="..\library\security\openid\consumer\demo\demo-safe.ecf" readonly="false"/>
 		<library name="http_authorization" location="..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
-		<library name="ewf_support" location="..\library\server\ewf_support\ewf_support-safe.ecf" readonly="false"/>
 		<library name="ewsgi" location="..\library\server\ewsgi\ewsgi-safe.ecf" readonly="false"/>
 		<library name="ewsgi_spec" location="..\library\server\ewsgi\ewsgi_spec-safe.ecf" readonly="false"/>
 		<library name="connector_cgi" location="..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>