From 4f72b84c59ae5f12413b3e0892bad05d84ce78a3 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 17 Jun 2024 11:58:35 -0500
Subject: [PATCH] Cleanup ee9 DefaultServletTest

+ Fix various warnings
+ Disable ODD_JAR / extraClassPath (temporarily)
+ Reenable disabled test Test
+ Reenable disabled test testListingContextBreakout
---
 .../jetty/ee9/servlet/DefaultServletTest.java | 1275 +++++++++++------
 1 file changed, 843 insertions(+), 432 deletions(-)

diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java
index 3824d5f5f6ff..49846109bf95 100644
--- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java
+++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java
@@ -15,7 +15,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.ByteBuffer;
@@ -33,7 +32,6 @@
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
@@ -57,6 +55,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.SymlinkAllowedResourceAliasChecker;
 import org.eclipse.jetty.toolchain.test.FS;
+import org.eclipse.jetty.toolchain.test.MavenPaths;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
@@ -67,7 +66,6 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -91,43 +89,41 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 @ExtendWith(WorkDirExtension.class)
 public class DefaultServletTest
 {
-    public Path docRoot;
+    public WorkDir workDir;
 
     // The name of the odd-jar used for testing "jar:file://" based resource access.
     private static final String ODD_JAR = "jar-resource-odd.jar";
 
     private Server server;
     private LocalConnector connector;
-    private ServletContextHandler context;
 
     @BeforeEach
-    public void init(WorkDir workDir) throws Exception
+    public void ensureFileSystemPoolIsSane()
     {
         assertThat(FileSystemPool.INSTANCE.mounts(), empty());
-        docRoot = workDir.getEmptyPathDir().resolve("docroot");
-        FS.ensureDirExists(docRoot);
+    }
 
+    public void startServer(Consumer<ServletContextHandler> contextInit) throws Exception
+    {
         server = new Server();
 
         connector = new LocalConnector(server);
         connector.getConnectionFactory(HttpConfiguration.ConnectionFactory.class).getHttpConfiguration().setSendServerVersion(false);
 
-        File extraJarResources = MavenTestingUtils.getTargetFile(ODD_JAR);
-        URL[] urls = new URL[]{extraJarResources.toURI().toURL()};
-
-        ClassLoader parentClassLoader = Thread.currentThread().getContextClassLoader();
-        URLClassLoader extraClassLoader = new URLClassLoader(urls, parentClassLoader);
-
-        context = new ServletContextHandler();
-        context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+        ServletContextHandler context = new ServletContextHandler();
+        // DO NOT SET Base Resource here (some tests rely on alternate/none base resources)
+        // context.setBaseResource();
         context.setContextPath("/context");
         context.setWelcomeFiles(new String[]{"index.html", "index.jsp", "index.htm"});
-        context.setClassLoader(extraClassLoader);
+
+        if (contextInit != null)
+            contextInit.accept(context);
 
         server.setHandler(context);
         server.addConnector(connector);
@@ -138,18 +134,31 @@ public void init(WorkDir workDir) throws Exception
     @AfterEach
     public void destroy() throws Exception
     {
-        server.stop();
-        server.join();
+        if (server != null)
+        {
+            server.stop();
+            server.join();
+        }
         assertThat(FileSystemPool.INSTANCE.mounts(), empty());
     }
 
     @Test
     public void testListingWithSession() throws Exception
     {
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("gzip", "false");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            // this url-pattern is intentionally at '/*' to test behaviors when there
+            // are two (or more) DefaultServlets on overlapping url-patterns.
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("gzip", "false");
+        });
 
         /* create some content in the docroot */
         FS.ensureDirExists(docRoot.resolve("one"));
@@ -171,10 +180,20 @@ public void testListingWithSession() throws Exception
     @Test
     public void testListingXSS() throws Exception
     {
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("gzip", "false");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            // this url-pattern is intentionally at '/*' to test behaviors when there
+            // are two (or more) DefaultServlets on overlapping url-patterns.
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("gzip", "false");
+        });
 
         /* create some content in the docroot */
         Path one = docRoot.resolve("one");
@@ -189,16 +208,20 @@ public void testListingXSS() throws Exception
          * Intentionally bad request URI. Sending a non-encoded URI with typically
          * encoded characters '<', '>', and '"'.
          */
-        String req1 = "GET /context/;<script>window.alert(\"hi\");</script> HTTP/1.0\r\n" +
-            "\r\n";
+        String req1 = """
+            GET /context/;<script>window.alert("hi");</script> HTTP/1.0\r
+            \r
+            """;
         String rawResponse = connector.getResponse(req1);
         HttpTester.Response response = HttpTester.parseResponse(rawResponse);
 
         String body = response.getContent();
         assertThat(body, not(containsString("<script>")));
 
-        req1 = "GET /context/one/;\"onmouseover='alert(document.location)' HTTP/1.0\r\n" +
-            "\r\n";
+        req1 = """
+            GET /context/one/;"onmouseover='alert(document.location)' HTTP/1.0\r
+            \r
+            """;
 
         rawResponse = connector.getResponse(req1);
         response = HttpTester.parseResponse(rawResponse);
@@ -211,10 +234,20 @@ public void testListingXSS() throws Exception
     @Test
     public void testListingWithQuestionMarks() throws Exception
     {
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("gzip", "false");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            // this url-pattern is intentionally at '/*' to test behaviors when there
+            // are two (or more) DefaultServlets on overlapping url-patterns.
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("gzip", "false");
+        });
 
         /* create some content in the docroot */
         FS.ensureDirExists(docRoot.resolve("one"));
@@ -239,13 +272,10 @@ public void testListingWithQuestionMarks() throws Exception
     @Test
     public void testListingFilenamesOnly() throws Exception
     {
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("gzip", "false");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
         /* create some content in the docroot */
-        FS.ensureDirExists(docRoot);
         Path one = docRoot.resolve("one");
         FS.ensureDirExists(one);
         Path deep = one.resolve("deep");
@@ -255,7 +285,18 @@ public void testListingFilenamesOnly() throws Exception
         FS.ensureDirExists(docRoot.resolve("three"));
 
         String resBasePath = docRoot.toAbsolutePath().toString();
-        defholder.setInitParameter("resourceBase", resBasePath);
+
+        startServer((context) ->
+        {
+            // this url-pattern is intentionally at '/*' to test behaviors when there
+            // are two (or more) DefaultServlets on overlapping url-patterns.
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("gzip", "false");
+
+            defholder.setInitParameter("resourceBase", resBasePath);
+        });
 
         String req1 = "GET /context/one/deep/ HTTP/1.0\n\n";
         String rawResponse = connector.getResponse(req1);
@@ -273,33 +314,46 @@ public void testListingFilenamesOnly() throws Exception
      * This test ensures that this behavior will not arise again.
      */
     @Test
-    @Disabled // TODO
     public void testListingFilenamesOnlyUrlResource() throws Exception
     {
-        URL extraResource = context.getClassLoader().getResource("rez/one");
-        assertNotNull(extraResource, "Must have extra jar resource in classloader");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
-        String extraResourceBaseString = extraResource.toURI().toASCIIString();
-        extraResourceBaseString = extraResourceBaseString.substring(0, extraResourceBaseString.length() - "/one".length());
+        Path extraJarResources = MavenPaths.findTestResourceFile(ODD_JAR);
+        assertTrue(Files.exists(extraJarResources), "Unable to find " + ODD_JAR);
+        URL[] urls = new URL[]{extraJarResources.toUri().toURL()};
+        ClassLoader parentClassLoader = Thread.currentThread().getContextClassLoader();
+        URLClassLoader extraClassLoader = new URLClassLoader(urls, parentClassLoader);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/extra/*");
-        defholder.setInitParameter("resourceBase", extraResourceBaseString);
-        defholder.setInitParameter("pathInfoOnly", "true");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("gzip", "false");
+        URL extraResource = extraClassLoader.getResource("rez/one");
+        assertNotNull(extraResource, "Must have extra jar resource in classloader");
+        String extraResourceBaseURI = extraResource.toURI().toASCIIString();
+        final String extraResourceBaseString = extraResourceBaseURI.substring(0, extraResourceBaseURI.length() - "/one".length());
 
-        StringBuffer req1;
+        startServer((context) ->
+        {
+            context.setClassLoader(extraClassLoader);
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/extra/*");
+            defholder.setInitParameter("resourceBase", extraResourceBaseString);
+            defholder.setInitParameter("pathInfoOnly", "true");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("gzip", "false");
+        });
+
+        String req1;
         String rawResponse;
         HttpTester.Response response;
         String body;
 
         // Test that GET works first.
-        req1 = new StringBuffer();
-        req1.append("GET /context/extra/one HTTP/1.0\n");
-        req1.append("\n");
+        req1 = """
+            GET /context/extra/one HTTP/1.0
+            
+            """;
 
-        rawResponse = connector.getResponse(req1.toString());
+        rawResponse = connector.getResponse(req1);
         response = HttpTester.parseResponse(rawResponse);
 
         assertThat(response.getStatus(), is(HttpStatus.OK_200));
@@ -307,11 +361,12 @@ public void testListingFilenamesOnlyUrlResource() throws Exception
         assertThat(body, containsString("is this the one?"));
 
         // Typical directory listing of location in jar:file:// URL
-        req1 = new StringBuffer();
-        req1.append("GET /context/extra/deep/ HTTP/1.0\r\n");
-        req1.append("\r\n");
+        req1 = """
+            GET /context/extra/deep/ HTTP/1.0
+            
+            """;
 
-        rawResponse = connector.getResponse(req1.toString());
+        rawResponse = connector.getResponse(req1);
         response = HttpTester.parseResponse(rawResponse);
 
         assertThat(response.getStatus(), is(HttpStatus.OK_200));
@@ -324,11 +379,12 @@ public void testListingFilenamesOnlyUrlResource() throws Exception
         assertThat(body, not(containsString(ODD_JAR)));
 
         // Get deep resource
-        req1 = new StringBuffer();
-        req1.append("GET /context/extra/deep/yyy HTTP/1.0\r\n");
-        req1.append("\r\n");
+        req1 = """
+            GET /context/extra/deep/yyy HTTP/1.0
+            
+            """;
 
-        rawResponse = connector.getResponse(req1.toString());
+        rawResponse = connector.getResponse(req1);
         response = HttpTester.parseResponse(rawResponse);
 
         assertThat(response.getStatus(), is(HttpStatus.OK_200));
@@ -337,11 +393,12 @@ public void testListingFilenamesOnlyUrlResource() throws Exception
 
         // Convoluted directory listing of location in jar:file:// URL
         // This exists to test proper encoding output
-        req1 = new StringBuffer();
-        req1.append("GET /context/extra/oddities/ HTTP/1.0\r\n");
-        req1.append("\r\n");
+        req1 = """
+            GET /context/extra/oddities/ HTTP/1.0
+            
+            """;
 
-        rawResponse = connector.getResponse(req1.toString());
+        rawResponse = connector.getResponse(req1);
         response = HttpTester.parseResponse(rawResponse);
 
         assertThat(response.getStatus(), is(HttpStatus.OK_200));
@@ -362,10 +419,20 @@ public void testListingFilenamesOnlyUrlResource() throws Exception
     @Test
     public void testListingProperUrlEncoding() throws Exception
     {
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("gzip", "false");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            // this url-pattern is intentionally at '/*' to test behaviors when there
+            // are two (or more) DefaultServlets on overlapping url-patterns.
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("gzip", "false");
+        });
 
         /* create some content in the docroot */
 
@@ -471,7 +538,7 @@ public static Stream<Arguments> contextBreakoutScenarios()
             );
 
             // A Raw Question mark in the prefix can be interpreted as a query section
-            if (prefix.contains("?"))
+            if (prefix.contains("?") || prefix.contains(";"))
             {
                 scenarios.addScenario(
                     "GET " + prefix + "/../index.html",
@@ -576,19 +643,26 @@ public static Stream<Arguments> contextBreakoutScenarios()
 
     @ParameterizedTest
     @MethodSource("contextBreakoutScenarios")
-    @Disabled // TODO
-    public void testListingContextBreakout(Scenario scenario, WorkDir workDir) throws Exception
+    public void testListingContextBreakout(Scenario scenario) throws Exception
     {
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("gzip", "false");
-        defholder.setInitParameter("aliases", "true");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("gzip", "false");
+            defholder.setInitParameter("aliases", "true");
+        });
 
         /* create some content in the docroot */
 
         Path index = docRoot.resolve("index.html");
-        createFile(index, "<h1>Hello Index</h1>");
+        Files.writeString(index, "<h1>Hello Index</h1>", UTF_8);
 
         if (!OS.WINDOWS.isCurrentOs())
         {
@@ -603,7 +677,7 @@ public void testListingContextBreakout(Scenario scenario, WorkDir workDir) throw
         Path sekret = workDir.getPath().resolve("sekret");
         FS.ensureDirExists(sekret);
         Path pass = sekret.resolve("pass");
-        createFile(pass, "Sssh, you shouldn't be seeing this");
+        Files.writeString(pass, "Sssh, you shouldn't be seeing this", UTF_8);
 
         /* At this point we have the following
          * testListingContextBreakout/
@@ -665,6 +739,9 @@ public static Stream<Arguments> welcomeScenarios()
     @MethodSource("welcomeScenarios")
     public void testWelcome(Scenario scenario) throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path one = docRoot.resolve("one");
         Path two = docRoot.resolve("two");
         Path three = docRoot.resolve("three");
@@ -672,24 +749,29 @@ public void testWelcome(Scenario scenario) throws Exception
         FS.ensureDirExists(two);
         FS.ensureDirExists(three);
 
-        createFile(one.resolve("index.htm"), "<h1>Hello Inde</h1>");
-        createFile(two.resolve("index.html"), "<h1>Hello Index</h1>");
+        Files.writeString(one.resolve("index.htm"), "<h1>Hello Inde</h1>", UTF_8);
+        Files.writeString(two.resolve("index.html"), "<h1>Hello Index</h1>", UTF_8);
 
-        createFile(three.resolve("index.html"), "<h1>Three Index</h1>");
-        createFile(three.resolve("index.htm"), "<h1>Three Inde</h1>");
+        Files.writeString(three.resolve("index.html"), "<h1>Three Index</h1>", UTF_8);
+        Files.writeString(three.resolve("index.htm"), "<h1>Three Inde</h1>", UTF_8);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
 
-        defholder.setInitParameter("maxCacheSize", "1024000");
-        defholder.setInitParameter("maxCachedFileSize", "512000");
-        defholder.setInitParameter("maxCachedFiles", "100");
+            defholder.setInitParameter("maxCacheSize", "1024000");
+            defholder.setInitParameter("maxCachedFileSize", "512000");
+            defholder.setInitParameter("maxCachedFiles", "100");
 
-        ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
-        context.addServlet(jspholder, "/index.jsp");
+            ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
+            context.addServlet(jspholder, "/index.jsp");
+        });
 
         String rawResponse = connector.getResponse(scenario.rawRequest);
         HttpTester.Response response = HttpTester.parseResponse(rawResponse);
@@ -699,8 +781,11 @@ public void testWelcome(Scenario scenario) throws Exception
     }
 
     @Test
-    public void testWelcomeMultipleBasesBase(WorkDir workDir) throws Exception
+    public void testWelcomeMultipleBasesBase() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path dir = docRoot.resolve("dir");
         FS.ensureDirExists(dir);
         Path inde = dir.resolve("index.htm");
@@ -712,30 +797,33 @@ public void testWelcomeMultipleBasesBase(WorkDir workDir) throws Exception
         Path altInde = altDir.resolve("index.htm");
         Path altIndex = altDir.resolve("index.html");
 
-        ServletHolder altholder = context.addServlet(DefaultServlet.class, "/alt/*");
-        altholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString());
-        altholder.setInitParameter("pathInfoOnly", "true");
-        altholder.setInitParameter("dirAllowed", "false");
-        altholder.setInitParameter("redirectWelcome", "false");
-        altholder.setInitParameter("welcomeServlets", "false");
-        altholder.setInitParameter("gzip", "false");
-
-        ServletHolder otherholder = context.addServlet(DefaultServlet.class, "/other/*");
-        otherholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString());
-        otherholder.setInitParameter("pathInfoOnly", "true");
-        otherholder.setInitParameter("dirAllowed", "true");
-        otherholder.setInitParameter("redirectWelcome", "false");
-        otherholder.setInitParameter("welcomeServlets", "false");
-        otherholder.setInitParameter("gzip", "false");
-
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
-
-        @SuppressWarnings("unused")
-        ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
+        startServer((context) ->
+        {
+            ServletHolder altholder = context.addServlet(DefaultServlet.class, "/alt/*");
+            altholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString());
+            altholder.setInitParameter("pathInfoOnly", "true");
+            altholder.setInitParameter("dirAllowed", "false");
+            altholder.setInitParameter("redirectWelcome", "false");
+            altholder.setInitParameter("welcomeServlets", "false");
+            altholder.setInitParameter("gzip", "false");
+
+            ServletHolder otherholder = context.addServlet(DefaultServlet.class, "/other/*");
+            otherholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString());
+            otherholder.setInitParameter("pathInfoOnly", "true");
+            otherholder.setInitParameter("dirAllowed", "true");
+            otherholder.setInitParameter("redirectWelcome", "false");
+            otherholder.setInitParameter("welcomeServlets", "false");
+            otherholder.setInitParameter("gzip", "false");
+
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
+
+            context.addServlet(NoJspServlet.class, "*.jsp");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -761,7 +849,7 @@ public void testWelcomeMultipleBasesBase(WorkDir workDir) throws Exception
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.FORBIDDEN_403));
 
-        createFile(altIndex, "<h1>Alt Index</h1>");
+        Files.writeString(altIndex, "<h1>Alt Index</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/alt/dir/index.html HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
@@ -772,7 +860,7 @@ public void testWelcomeMultipleBasesBase(WorkDir workDir) throws Exception
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
         assertThat(response.getContent(), containsString("<h1>Alt Index</h1>"));
 
-        createFile(altInde, "<h1>Alt Inde</h1>");
+        Files.writeString(altInde, "<h1>Alt Inde</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/alt/dir/ HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
@@ -798,13 +886,13 @@ public void testWelcomeMultipleBasesBase(WorkDir workDir) throws Exception
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.FORBIDDEN_403));
 
-        createFile(index, "<h1>Hello Index</h1>");
+        Files.writeString(index, "<h1>Hello Index</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/dir/ HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
         assertThat(response.getContent(), containsString("<h1>Hello Index</h1>"));
 
-        createFile(inde, "<h1>Hello Inde</h1>");
+        Files.writeString(inde, "<h1>Hello Inde</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/dir/ HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
@@ -827,29 +915,35 @@ public void testWelcomeMultipleBasesBase(WorkDir workDir) throws Exception
     }
 
     @Test
-    public void testIncludedWelcomeDifferentBase(WorkDir workDir) throws Exception
+    public void testIncludedWelcomeDifferentBase() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path altRoot = workDir.getEmptyPathDir().resolve("altroot");
         FS.ensureDirExists(altRoot);
         Path altIndex = altRoot.resolve("index.html");
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/alt/*");
-        defholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString());
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "true");
-        defholder.setInitParameter("pathInfoOnly", "true");
-
-        ServletHolder gwholder = new ServletHolder("gateway", new HttpServlet()
+        startServer((context) ->
         {
-            @Override
-            protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-                    throws ServletException, IOException
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/alt/*");
+            defholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString());
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "true");
+            defholder.setInitParameter("pathInfoOnly", "true");
+
+            ServletHolder gwholder = new ServletHolder("gateway", new HttpServlet()
             {
-                req.getRequestDispatcher("/alt/").include(req, resp);
-            }
+                @Override
+                protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+                    throws ServletException, IOException
+                {
+                    req.getRequestDispatcher("/alt/").include(req, resp);
+                }
+            });
+            context.addServlet(gwholder, "/gateway");
         });
-        context.addServlet(gwholder, "/gateway");
 
         String rawResponse;
         HttpTester.Response response;
@@ -861,7 +955,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         // should be used
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.INTERNAL_SERVER_ERROR_500));
 
-        createFile(altIndex, "<h1>Alt Index</h1>");
+        Files.writeString(altIndex, "<h1>Alt Index</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/gateway HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
@@ -871,23 +965,30 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
     @Test
     public void testWelcomeRedirect() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path dir = docRoot.resolve("dir");
         FS.ensureDirExists(dir);
         Path inde = dir.resolve("index.htm");
         Path index = dir.resolve("index.html");
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "true");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        defholder.setInitParameter("maxCacheSize", "1024000");
-        defholder.setInitParameter("maxCachedFileSize", "512000");
-        defholder.setInitParameter("maxCachedFiles", "100");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "true");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
 
-        @SuppressWarnings("unused")
-        ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
+            defholder.setInitParameter("maxCacheSize", "1024000");
+            defholder.setInitParameter("maxCachedFileSize", "512000");
+            defholder.setInitParameter("maxCachedFiles", "100");
+
+            context.addServlet(NoJspServlet.class, "*.jsp");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -896,13 +997,13 @@ public void testWelcomeRedirect() throws Exception
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.FORBIDDEN_403));
 
-        createFile(index, "<h1>Hello Index</h1>");
+        Files.writeString(index, "<h1>Hello Index</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/dir/ HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.MOVED_TEMPORARILY_302));
         assertThat(response, headerValue("Location", "/context/dir/index.html"));
 
-        createFile(inde, "<h1>Hello Inde</h1>");
+        Files.writeString(inde, "<h1>Hello Inde</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/dir HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.MOVED_TEMPORARILY_302));
@@ -932,23 +1033,31 @@ public void testWelcomeRedirect() throws Exception
     @Test
     public void testRelativeRedirect() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path dir = docRoot.resolve("dir");
         FS.ensureDirExists(dir);
         Path index = dir.resolve("index.html");
-        createFile(index, "<h1>Hello Index</h1>");
+        Files.writeString(index, "<h1>Hello Index</h1>", UTF_8);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        context.addAliasCheck((p, r) -> true);
-        connector.getConnectionFactory(HttpConfiguration.ConnectionFactory.class).getHttpConfiguration().setRelativeRedirectAllowed(true);
+            context.addAliasCheck((p, r) -> true);
+            connector.getConnectionFactory(HttpConfiguration.ConnectionFactory.class).getHttpConfiguration().setRelativeRedirectAllowed(true);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "true");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "true");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
 
-        defholder.setInitParameter("maxCacheSize", "1024000");
-        defholder.setInitParameter("maxCachedFileSize", "512000");
-        defholder.setInitParameter("maxCachedFiles", "100");
+            defholder.setInitParameter("maxCacheSize", "1024000");
+            defholder.setInitParameter("maxCachedFileSize", "512000");
+            defholder.setInitParameter("maxCachedFiles", "100");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -975,17 +1084,25 @@ public void testRelativeRedirect() throws Exception
     @Test
     public void testWelcomeRedirectDirWithQuestion() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         FS.ensureDirExists(docRoot);
         Path dir = assumeMkDirSupported(docRoot, "dir?");
 
         Path index = dir.resolve("index.html");
-        createFile(index, "<h1>Hello Index</h1>");
+        Files.writeString(index, "<h1>Hello Index</h1>", UTF_8);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "true");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "true");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1007,17 +1124,25 @@ public void testWelcomeRedirectDirWithQuestion() throws Exception
     @Test
     public void testWelcomeRedirectDirWithSemicolon() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         FS.ensureDirExists(docRoot);
         Path dir = assumeMkDirSupported(docRoot, "dir;");
 
         Path index = dir.resolve("index.html");
-        createFile(index, "<h1>Hello Index</h1>");
+        Files.writeString(index, "<h1>Hello Index</h1>", UTF_8);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "true");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "true");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1036,17 +1161,24 @@ public void testWelcomeRedirectDirWithSemicolon() throws Exception
     @Test
     public void testWelcomeServlet() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path inde = docRoot.resolve("index.htm");
         Path index = docRoot.resolve("index.html");
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "true");
-        defholder.setInitParameter("gzip", "false");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        @SuppressWarnings("unused")
-        ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "true");
+            defholder.setInitParameter("gzip", "false");
+
+            context.addServlet(NoJspServlet.class, "*.jsp");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1056,13 +1188,13 @@ public void testWelcomeServlet() throws Exception
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.INTERNAL_SERVER_ERROR_500));
         assertThat(response.getContent(), containsString("JSP support not configured"));
 
-        createFile(index, "<h1>Hello Index</h1>");
+        Files.writeString(index, "<h1>Hello Index</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/ HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
         assertThat(response.getContent(), containsString("<h1>Hello Index</h1>"));
 
-        createFile(inde, "<h1>Hello Inde</h1>");
+        Files.writeString(inde, "<h1>Hello Inde</h1>", UTF_8);
         rawResponse = connector.getResponse("GET /context/ HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
@@ -1086,8 +1218,11 @@ public void testWelcomeServlet() throws Exception
     }
 
     @Test
-    public void testSymLinks() throws Exception
+    public void testSymLinksNoAliasChecks() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         FS.ensureDirExists(docRoot);
         Path dir = docRoot.resolve("dir");
         Path dirLink = docRoot.resolve("dirlink");
@@ -1096,10 +1231,18 @@ public void testSymLinks() throws Exception
         Path foobar = dir.resolve("foobar.txt");
         Path link = dir.resolve("link.txt");
         Path rLink = dir.resolve("rlink.txt");
-        createFile(foobar, "Foo Bar");
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+        Files.writeString(foobar, "Foo Bar", UTF_8);
 
-        defholder.setInitParameter("gzip", "false");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("gzip", "false");
+
+            if (!OS.WINDOWS.isCurrentOs())
+                context.clearAliasChecks();
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1111,8 +1254,6 @@ public void testSymLinks() throws Exception
 
         if (!OS.WINDOWS.isCurrentOs())
         {
-            context.clearAliasChecks();
-
             Files.createSymbolicLink(dirLink, dir);
             Files.createSymbolicLink(dirRLink, new File("dir").toPath());
             Files.createSymbolicLink(link, foobar);
@@ -1140,8 +1281,50 @@ public void testSymLinks() throws Exception
             rawResponse = connector.getResponse("GET /context/dirrlink/rlink.txt HTTP/1.0\r\n\r\n");
             response = HttpTester.parseResponse(rawResponse);
             assertThat(response.toString(), response.getStatus(), is(HttpStatus.NOT_FOUND_404));
+        }
+    }
+
+    @Test
+    public void testSymlinkAllowedResourceAliasChecker() throws Exception
+    {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        FS.ensureDirExists(docRoot);
+        Path dir = docRoot.resolve("dir");
+        Path dirLink = docRoot.resolve("dirlink");
+        Path dirRLink = docRoot.resolve("dirrlink");
+        FS.ensureDirExists(dir);
+        Path foobar = dir.resolve("foobar.txt");
+        Path link = dir.resolve("link.txt");
+        Path rLink = dir.resolve("rlink.txt");
+        Files.writeString(foobar, "Foo Bar", UTF_8);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("gzip", "false");
 
             context.addAliasCheck(new SymlinkAllowedResourceAliasChecker(context.getCoreContextHandler()));
+        });
+
+        String rawResponse;
+        HttpTester.Response response;
+
+        rawResponse = connector.getResponse("GET /context/dir/foobar.txt HTTP/1.0\r\n\r\n");
+        response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
+        assertThat(response.getContent(), containsString("Foo Bar"));
+
+        if (!OS.WINDOWS.isCurrentOs())
+        {
+            Files.createSymbolicLink(dirLink, dir);
+            Files.createSymbolicLink(dirRLink, new File("dir").toPath());
+            Files.createSymbolicLink(link, foobar);
+            Files.createSymbolicLink(rLink, new File("foobar.txt").toPath());
+
             rawResponse = connector.getResponse("GET /context/dir/link.txt HTTP/1.0\r\n\r\n");
             response = HttpTester.parseResponse(rawResponse);
             assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
@@ -1194,6 +1377,9 @@ public static Stream<Arguments> welcomeServletScenarios()
     @MethodSource("welcomeServletScenarios")
     public void testWelcomeExactServlet(Scenario scenario) throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         FS.ensureDirExists(docRoot);
 
         Path one = docRoot.resolve("one");
@@ -1203,20 +1389,25 @@ public void testWelcomeExactServlet(Scenario scenario) throws Exception
         FS.ensureDirExists(two);
         FS.ensureDirExists(three);
 
-        createFile(one.resolve("index.htm"), "<h1>Hello Inde</h1>");
-        createFile(two.resolve("index.html"), "<h1>Hello Index</h1>");
+        Files.writeString(one.resolve("index.htm"), "<h1>Hello Inde</h1>", UTF_8);
+        Files.writeString(two.resolve("index.html"), "<h1>Hello Index</h1>", UTF_8);
 
-        createFile(three.resolve("index.html"), "<h1>Three Index</h1>");
-        createFile(three.resolve("index.htm"), "<h1>Three Inde</h1>");
+        Files.writeString(three.resolve("index.html"), "<h1>Three Index</h1>", UTF_8);
+        Files.writeString(three.resolve("index.htm"), "<h1>Three Inde</h1>", UTF_8);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "exact");
-        defholder.setInitParameter("gzip", "false");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
-        context.addServlet(jspholder, "/index.jsp");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "exact");
+            defholder.setInitParameter("gzip", "false");
+
+            ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
+            context.addServlet(jspholder, "/index.jsp");
+        });
 
         String rawResponse = connector.getResponse(scenario.rawRequest);
         HttpTester.Response response = HttpTester.parseResponse(rawResponse);
@@ -1228,17 +1419,24 @@ public void testWelcomeExactServlet(Scenario scenario) throws Exception
     @Test
     public void testDirectFromResourceHttpContent() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
         FS.ensureDirExists(docRoot);
+
         Path index = docRoot.resolve("index.html");
-        createFile(index, "<h1>Hello World</h1>");
+        Files.writeString(index, "<h1>Hello World</h1>", UTF_8);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "true");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("useFileMappedBuffer", "true");
-        defholder.setInitParameter("welcomeServlets", "exact");
-        defholder.setInitParameter("gzip", "false");
-        defholder.setInitParameter("resourceCache", "resourceCache");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "true");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("useFileMappedBuffer", "true");
+            defholder.setInitParameter("welcomeServlets", "exact");
+            defholder.setInitParameter("gzip", "false");
+            defholder.setInitParameter("resourceCache", "resourceCache");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1256,19 +1454,24 @@ public static Stream<Arguments> rangeScenarios()
 
         scenarios.addScenario(
             "No range requested",
-            "GET /context/data.txt HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Connection: close\r\n\r\n",
+            """
+                GET /context/data.txt HTTP/1.1\r
+                Host: localhost\r
+                Connection: close\r
+                \r
+                """,
             HttpStatus.OK_200,
             (response) -> assertThat(response, containsHeaderValue(HttpHeader.ACCEPT_RANGES, "bytes"))
         );
 
         scenarios.addScenario(
             "Simple range request (no-close)",
-            "GET /context/data.txt HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9\r\n" +
-                "\r\n",
+            """
+                GET /context/data.txt HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1280,11 +1483,13 @@ public static Stream<Arguments> rangeScenarios()
 
         scenarios.addScenario(
             "Simple range request w/close",
-            "GET /context/data.txt HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9\r\n" +
-                "Connection: close\r\n" +
-                "\r\n",
+            """
+                GET /context/data.txt HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9\r
+                Connection: close\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1294,10 +1499,12 @@ public static Stream<Arguments> rangeScenarios()
 
         scenarios.addScenario(
             "Multiple ranges (x3)",
-            "GET /context/data.txt HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9,20-29,40-49\r\n" +
-                "\r\n",
+            """
+                GET /context/data.txt HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9,20-29,40-49\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1320,10 +1527,12 @@ public static Stream<Arguments> rangeScenarios()
         );
 
         scenarios.addScenario("Multiple ranges (x4)",
-            "GET /context/data.txt HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9,20-29,40-49,70-79\r\n" +
-                "\r\n",
+            """
+                GET /context/data.txt HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9,20-29,40-49,70-79\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1348,10 +1557,12 @@ public static Stream<Arguments> rangeScenarios()
 
         scenarios.addScenario(
             "Multiple ranges (x4) with empty range request",
-            "GET /context/data.txt HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9,20-29,40-49,60-60,70-79\r\n" +
-                "\r\n",
+            """
+                GET /context/data.txt HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9,20-29,40-49,60-60,70-79\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1379,19 +1590,23 @@ public static Stream<Arguments> rangeScenarios()
 
         scenarios.addScenario(
             "No mimetype resource - no range requested",
-            "GET /context/nofilesuffix HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "\r\n",
+            """
+                GET /context/nofilesuffix HTTP/1.1\r
+                Host: localhost\r
+                \r
+                """,
             HttpStatus.OK_200,
             (response) -> assertThat(response, containsHeaderValue(HttpHeader.ACCEPT_RANGES, "bytes"))
         );
 
         scenarios.addScenario(
             "No mimetype resource - simple range request",
-            "GET /context/nofilesuffix HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9\r\n" +
-                "\r\n",
+            """
+                GET /context/nofilesuffix HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1403,10 +1618,12 @@ public static Stream<Arguments> rangeScenarios()
 
         scenarios.addScenario(
             "No mimetype resource - multiple ranges (x3)",
-            "GET /context/nofilesuffix HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9,20-29,40-49\r\n" +
-                "\r\n",
+            """
+                GET /context/nofilesuffix HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9,20-29,40-49\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1430,10 +1647,12 @@ public static Stream<Arguments> rangeScenarios()
 
         scenarios.addScenario(
             "No mimetype resource - multiple ranges (x5) with empty range request",
-            "GET /context/nofilesuffix HTTP/1.1\r\n" +
-                "Host: localhost\r\n" +
-                "Range: bytes=0-9,20-29,40-49,60-60,70-79\r\n" +
-                "\r\n",
+            """
+                GET /context/nofilesuffix HTTP/1.1\r
+                Host: localhost\r
+                Range: bytes=0-9,20-29,40-49,60-60,70-79\r
+                \r
+                """,
             HttpStatus.PARTIAL_CONTENT_206,
             (response) ->
             {
@@ -1465,20 +1684,28 @@ public static Stream<Arguments> rangeScenarios()
     @MethodSource("rangeScenarios")
     public void testRangeRequests(Scenario scenario) throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         FS.ensureDirExists(docRoot);
         Path data = docRoot.resolve("data.txt");
-        createFile(data, "01234567890123456789012345678901234567890123456789012345678901234567890123456789");
+        Files.writeString(data, "01234567890123456789012345678901234567890123456789012345678901234567890123456789", UTF_8);
 
         // test a range request with a file with no suffix, therefore no mimetype
         Path nofilesuffix = docRoot.resolve("nofilesuffix");
-        createFile(nofilesuffix, "01234567890123456789012345678901234567890123456789012345678901234567890123456789");
+        Files.writeString(nofilesuffix, "01234567890123456789012345678901234567890123456789012345678901234567890123456789", UTF_8);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
-        defholder.setInitParameter("acceptRanges", "true");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
+            defholder.setInitParameter("acceptRanges", "true");
+        });
 
         String rawResponse = connector.getResponse(scenario.rawRequest);
         HttpTester.Response response = HttpTester.parseResponse(rawResponse);
@@ -1488,27 +1715,46 @@ public void testRangeRequests(Scenario scenario) throws Exception
     }
 
     @Test
-    public void testFiltered() throws Exception
+    public void testFilteredOutput() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
         FS.ensureDirExists(docRoot);
-        Path file0 = docRoot.resolve("data0.txt");
-        createFile(file0, "Hello Text 0");
-        Path image = docRoot.resolve("image.jpg");
-        createFile(image, "not an image");
-
-        server.stop();
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "false");
-        server.start();
+
+        Path dataDir = docRoot.resolve("data");
+        Path altDir = docRoot.resolve("alt");
+        for (Path dir: List.of(dataDir, altDir))
+        {
+            FS.ensureDirExists(dir);
+            Path file0 = dir.resolve("data0.txt");
+            Files.writeString(file0, "Hello Text 0", UTF_8);
+            Path image = dir.resolve("image.jpg");
+            Files.writeString(image, "not an image", UTF_8);
+        }
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
+
+            context.addFilter(OutputFilter.class, "/data/*", EnumSet.of(DispatcherType.REQUEST));
+        });
 
         String rawResponse;
         HttpTester.Response response;
         String body;
 
-        rawResponse = connector.getResponse("GET /context/data0.txt HTTP/1.0\r\n\r\n");
+        // request of content without filter.
+        rawResponse = connector.getResponse("""
+            GET /context/alt/data0.txt HTTP/1.1
+            Host: test
+            Connection: close
+            
+            """);
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
         assertThat(response, containsHeaderValue(HttpHeader.CONTENT_LENGTH, "12"));
@@ -1517,11 +1763,13 @@ public void testFiltered() throws Exception
         body = response.getContent();
         assertThat(body, not(containsString("Extra Info")));
 
-        server.stop();
-        context.addFilter(OutputFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
-        server.start();
-
-        rawResponse = connector.getResponse("GET /context/data0.txt HTTP/1.0\r\n\r\n");
+        // Request of data with filter interaction
+        rawResponse = connector.getResponse("""
+            GET /context/data/data0.txt HTTP/1.1
+            Host: test
+            Connection: close
+            
+            """);
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
         body = response.getContent();
@@ -1529,21 +1777,77 @@ public void testFiltered() throws Exception
         assertThat(response, containsHeaderValue(HttpHeader.CONTENT_TYPE, "text/plain;charset=UTF-8"));
         assertThat(body, containsString("Extra Info"));
 
-        rawResponse = connector.getResponse("GET /context/image.jpg HTTP/1.0\r\n\r\n");
+        // Request of data with filter interaction
+        rawResponse = connector.getResponse("""
+            GET /context/data/image.jpg HTTP/1.1
+            Host: test
+            Connection: close
+            
+            """);
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
         body = response.getContent();
         assertThat(response, containsHeaderValue(HttpHeader.CONTENT_LENGTH, "" + body.length()));
         assertThat(response, containsHeaderValue(HttpHeader.CONTENT_TYPE, "image/jpeg;charset=utf-8"));
         assertThat(body, containsString("Extra Info"));
+    }
 
-        server.stop();
-        context.getServletHandler().setFilterMappings(new FilterMapping[]{});
-        context.getServletHandler().setFilters(new FilterHolder[]{});
-        context.addFilter(WriterFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
-        server.start();
+    @Test
+    public void testFilteredWriter() throws Exception
+    {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        Path dataDir = docRoot.resolve("data");
+        Path altDir = docRoot.resolve("alt");
+        for (Path dir: List.of(dataDir, altDir))
+        {
+            FS.ensureDirExists(dir);
+            Path file0 = dir.resolve("data0.txt");
+            Files.writeString(file0, "Hello Text 0", UTF_8);
+            Path image = dir.resolve("image.jpg");
+            Files.writeString(image, "not an image", UTF_8);
+        }
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        rawResponse = connector.getResponse("GET /context/data0.txt HTTP/1.0\r\n\r\n");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "false");
+
+            context.addFilter(WriterFilter.class, "/data/*", EnumSet.of(DispatcherType.REQUEST));
+        });
+
+        String rawResponse;
+        HttpTester.Response response;
+        String body;
+
+        // request of content without filter.
+        rawResponse = connector.getResponse("""
+            GET /context/alt/data0.txt HTTP/1.1
+            Host: test
+            Connection: close
+            
+            """);
+        response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
+        assertThat(response, containsHeaderValue(HttpHeader.CONTENT_LENGTH, "12"));
+        assertThat(response, containsHeaderValue(HttpHeader.CONTENT_TYPE, "text/plain"));
+        assertThat(response, not(containsHeaderValue(HttpHeader.CONTENT_TYPE, "charset=")));
+        body = response.getContent();
+        assertThat(body, not(containsString("Extra Info")));
+
+        // Request of data with filter interaction
+        rawResponse = connector.getResponse("""
+            GET /context/data/data0.txt HTTP/1.1
+            Host: test
+            Connection: close
+            
+            """);
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
         body = response.getContent();
@@ -1554,18 +1858,26 @@ public void testFiltered() throws Exception
     @Test
     public void testGzip() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         FS.ensureDirExists(docRoot);
         Path file0 = docRoot.resolve("data0.txt");
-        createFile(file0, "Hello Text 0");
+        Files.writeString(file0, "Hello Text 0", UTF_8);
         Path file0gz = docRoot.resolve("data0.txt.gz");
-        createFile(file0gz, "fake gzip");
+        Files.writeString(file0gz, "fake gzip", UTF_8);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "true");
-        defholder.setInitParameter("etags", "true");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "true");
+            defholder.setInitParameter("etags", "true");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1646,22 +1958,30 @@ public void testGzip() throws Exception
     @Test
     public void testCachedGzip() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         FS.ensureDirExists(docRoot);
         Path file0 = docRoot.resolve("data0.txt");
-        createFile(file0, "Hello Text 0");
+        Files.writeString(file0, "Hello Text 0", UTF_8);
         Path file0gz = docRoot.resolve("data0.txt.gz");
-        createFile(file0gz, "fake gzip");
-
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("gzip", "true");
-        defholder.setInitParameter("etags", "true");
+        Files.writeString(file0gz, "fake gzip", UTF_8);
 
-        defholder.setInitParameter("maxCachedFiles", "1024");
-        defholder.setInitParameter("maxCachedFileSize", "200000000");
-        defholder.setInitParameter("maxCacheSize", "256000000");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("gzip", "true");
+            defholder.setInitParameter("etags", "true");
+
+            defholder.setInitParameter("maxCachedFiles", "1024");
+            defholder.setInitParameter("maxCachedFileSize", "200000000");
+            defholder.setInitParameter("maxCacheSize", "256000000");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1727,15 +2047,23 @@ public void testCachedGzip() throws Exception
     @Test
     public void testBrotli() throws Exception
     {
-        createFile(docRoot.resolve("data0.txt"), "Hello Text 0");
-        createFile(docRoot.resolve("data0.txt.br"), "fake brotli");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("precompressed", "true");
-        defholder.setInitParameter("etags", "true");
+        Files.writeString(docRoot.resolve("data0.txt"), "Hello Text 0", UTF_8);
+        Files.writeString(docRoot.resolve("data0.txt.br"), "fake brotli", UTF_8);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("precompressed", "true");
+            defholder.setInitParameter("etags", "true");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1812,19 +2140,27 @@ public void testBrotli() throws Exception
     @Test
     public void testCachedBrotli() throws Exception
     {
-        createFile(docRoot.resolve("data0.txt"), "Hello Text 0");
-        createFile(docRoot.resolve("data0.txt.br"), "fake brotli");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("dirAllowed", "false");
-        defholder.setInitParameter("redirectWelcome", "false");
-        defholder.setInitParameter("welcomeServlets", "false");
-        defholder.setInitParameter("precompressed", "true");
-        defholder.setInitParameter("etags", "true");
+        Files.writeString(docRoot.resolve("data0.txt"), "Hello Text 0", UTF_8);
+        Files.writeString(docRoot.resolve("data0.txt.br"), "fake brotli", UTF_8);
 
-        defholder.setInitParameter("maxCachedFiles", "1024");
-        defholder.setInitParameter("maxCachedFileSize", "200000000");
-        defholder.setInitParameter("maxCacheSize", "256000000");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("dirAllowed", "false");
+            defholder.setInitParameter("redirectWelcome", "false");
+            defholder.setInitParameter("welcomeServlets", "false");
+            defholder.setInitParameter("precompressed", "true");
+            defholder.setInitParameter("etags", "true");
+
+            defholder.setInitParameter("maxCachedFiles", "1024");
+            defholder.setInitParameter("maxCachedFileSize", "200000000");
+            defholder.setInitParameter("maxCacheSize", "256000000");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1890,13 +2226,19 @@ public void testCachedBrotli() throws Exception
     @Test
     public void testDefaultBrotliOverGzip() throws Exception
     {
-        createFile(docRoot.resolve("data0.txt"), "Hello Text 0");
-        createFile(docRoot.resolve("data0.txt.br"), "fake brotli");
-        createFile(docRoot.resolve("data0.txt.gz"), "fake gzip");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("precompressed", "true");
-        defholder.setInitParameter("resourceBase", docRoot.toString());
+        Files.writeString(docRoot.resolve("data0.txt"), "Hello Text 0", UTF_8);
+        Files.writeString(docRoot.resolve("data0.txt.br"), "fake brotli", UTF_8);
+        Files.writeString(docRoot.resolve("data0.txt.gz"), "fake gzip", UTF_8);
+
+        startServer((context) ->
+        {
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("precompressed", "true");
+            defholder.setInitParameter("resourceBase", docRoot.toString());
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1936,14 +2278,20 @@ public void testDefaultBrotliOverGzip() throws Exception
     @Test
     public void testCustomCompressionFormats() throws Exception
     {
-        createFile(docRoot.resolve("data0.txt"), "Hello Text 0");
-        createFile(docRoot.resolve("data0.txt.br"), "fake brotli");
-        createFile(docRoot.resolve("data0.txt.gz"), "fake gzip");
-        createFile(docRoot.resolve("data0.txt.bz2"), "fake bzip2");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        Files.writeString(docRoot.resolve("data0.txt"), "Hello Text 0", UTF_8);
+        Files.writeString(docRoot.resolve("data0.txt.br"), "fake brotli", UTF_8);
+        Files.writeString(docRoot.resolve("data0.txt.gz"), "fake gzip", UTF_8);
+        Files.writeString(docRoot.resolve("data0.txt.bz2"), "fake bzip2", UTF_8);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("precompressed", "bzip2=.bz2,gzip=.gz,br=.br");
-        defholder.setInitParameter("resourceBase", docRoot.toString());
+        startServer((context) ->
+        {
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("precompressed", "bzip2=.bz2,gzip=.gz,br=.br");
+            defholder.setInitParameter("resourceBase", docRoot.toString());
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -1975,10 +2323,15 @@ public void testCustomCompressionFormats() throws Exception
     @Test
     public void testControlCharacter() throws Exception
     {
-        connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setUriCompliance(UriCompliance.UNSAFE);
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
         FS.ensureDirExists(docRoot);
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
-        defholder.setInitParameter("resourceBase", docRoot.toFile().getAbsolutePath());
+
+        startServer((context) ->
+        {
+            connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setUriCompliance(UriCompliance.UNSAFE);
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+            defholder.setInitParameter("resourceBase", docRoot.toFile().getAbsolutePath());
+        });
 
         try (StacklessLogging ignore = new StacklessLogging(ResourceService.class))
         {
@@ -1996,14 +2349,21 @@ public void testControlCharacter() throws Exception
     })
     public void testIfModified(String content) throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
         Path file = docRoot.resolve("file.txt");
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        defholder.setInitParameter("maxCacheSize", "4096");
-        defholder.setInitParameter("maxCachedFileSize", "25");
-        defholder.setInitParameter("maxCachedFiles", "100");
-        defholder.setInitParameter("cacheValidationTime", "0");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+
+            defholder.setInitParameter("maxCacheSize", "4096");
+            defholder.setInitParameter("maxCachedFileSize", "25");
+            defholder.setInitParameter("maxCachedFiles", "100");
+            defholder.setInitParameter("cacheValidationTime", "0");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -2012,7 +2372,7 @@ public void testIfModified(String content) throws Exception
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.NOT_FOUND_404));
 
-        createFile(file, content);
+        Files.writeString(file, content, UTF_8);
 
         rawResponse = connector.getResponse("GET /context/file.txt HTTP/1.1\r\nHost:test\r\nConnection:close\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
@@ -2049,14 +2409,22 @@ public void testIfModified(String content) throws Exception
     })
     public void testIfETag(String content) throws Exception
     {
-        createFile(docRoot.resolve("file.txt"), content);
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
-        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+        Files.writeString(docRoot.resolve("file.txt"), content, UTF_8);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
 
-        defholder.setInitParameter("maxCacheSize", "4096");
-        defholder.setInitParameter("maxCachedFileSize", "25");
-        defholder.setInitParameter("maxCachedFiles", "100");
-        defholder.setInitParameter("etags", "true");
+            ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+
+            defholder.setInitParameter("maxCacheSize", "4096");
+            defholder.setInitParameter("maxCachedFileSize", "25");
+            defholder.setInitParameter("maxCachedFiles", "100");
+            defholder.setInitParameter("etags", "true");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -2104,19 +2472,25 @@ public void testIfETag(String content) throws Exception
     @Test
     public void testGetUtf8NfcFile() throws Exception
     {
-        FS.ensureEmpty(docRoot);
-
-        context.addServlet(DefaultServlet.class, "/");
-        context.addAliasCheck(new AllowedResourceAliasChecker(context.getCoreContextHandler()));
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
         // Create file with UTF-8 NFC format
         String filename = "swedish-" + new String(StringUtil.fromHexString("C3A5"), UTF_8) + ".txt";
-        createFile(docRoot.resolve(filename), "hi a-with-circle");
+        Files.writeString(docRoot.resolve(filename), "hi a-with-circle", UTF_8);
 
         // Using filesystem, attempt to access via NFD format
         Path nfdPath = docRoot.resolve("swedish-a" + new String(StringUtil.fromHexString("CC8A"), UTF_8) + ".txt");
         boolean filesystemSupportsNFDAccess = Files.exists(nfdPath);
 
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            context.addServlet(DefaultServlet.class, "/");
+            context.addAliasCheck(new AllowedResourceAliasChecker(context.getCoreContextHandler()));
+        });
+
         // Make requests
         String rawResponse;
         HttpTester.Response response;
@@ -2144,19 +2518,25 @@ public void testGetUtf8NfcFile() throws Exception
     @Test
     public void testGetUtf8NfdFile() throws Exception
     {
-        FS.ensureEmpty(docRoot);
-
-        context.addServlet(DefaultServlet.class, "/");
-        context.addAliasCheck(new AllowedResourceAliasChecker(context.getCoreContextHandler()));
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
         // Create file with UTF-8 NFD format
         String filename = "swedish-a" + new String(StringUtil.fromHexString("CC8A"), UTF_8) + ".txt";
-        createFile(docRoot.resolve(filename), "hi a-with-circle");
+        Files.writeString(docRoot.resolve(filename), "hi a-with-circle", UTF_8);
 
         // Using filesystem, attempt to access via NFC format
         Path nfcPath = docRoot.resolve("swedish-" + new String(StringUtil.fromHexString("C3A5"), UTF_8) + ".txt");
         boolean filesystemSupportsNFCAccess = Files.exists(nfcPath);
 
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            context.addServlet(DefaultServlet.class, "/");
+            context.addAliasCheck(new AllowedResourceAliasChecker(context.getCoreContextHandler()));
+        });
+
         String rawResponse;
         HttpTester.Response response;
 
@@ -2183,9 +2563,17 @@ public void testGetUtf8NfdFile() throws Exception
     @Test
     public void testHead() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path file = docRoot.resolve("file.txt");
 
-        context.addServlet(DefaultServlet.class, "/");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            context.addServlet(DefaultServlet.class, "/");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -2215,9 +2603,17 @@ public void testHead() throws Exception
     @Test
     public void testPost() throws Exception
     {
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
         Path file = docRoot.resolve("file.txt");
 
-        context.addServlet(DefaultServlet.class, "/");
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+
+            context.addServlet(DefaultServlet.class, "/");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -2251,7 +2647,14 @@ public void testPost() throws Exception
     @Test
     public void testTrace() throws Exception
     {
-        context.addServlet(DefaultServlet.class, "/");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+            context.addServlet(DefaultServlet.class, "/");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -2269,7 +2672,14 @@ public void testTrace() throws Exception
     @Test
     public void testOptions() throws Exception
     {
-        context.addServlet(DefaultServlet.class, "/");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            context.setBaseResource(ResourceFactory.of(context).newResource(docRoot));
+            context.addServlet(DefaultServlet.class, "/");
+        });
 
         String rawResponse;
         HttpTester.Response response;
@@ -2288,11 +2698,17 @@ public void testOptions() throws Exception
     @Test
     public void testMemoryResourceRange() throws Exception
     {
-        Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
-        ResourceService resourceService = new ResourceService();
-        resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain"));
-        DefaultServlet defaultServlet = new DefaultServlet(resourceService);
-        context.addServlet(new ServletHolder(defaultServlet), "/");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
+            ResourceService resourceService = new ResourceService();
+            resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain"));
+            DefaultServlet defaultServlet = new DefaultServlet(resourceService);
+            context.addServlet(new ServletHolder(defaultServlet), "/");
+        });
 
         String rawResponse = connector.getResponse("""
             GET /context/ HTTP/1.1\r
@@ -2310,11 +2726,17 @@ public void testMemoryResourceRange() throws Exception
     @Test
     public void testMemoryResourceMultipleRanges() throws Exception
     {
-        Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
-        ResourceService resourceService = new ResourceService();
-        resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain"));
-        DefaultServlet defaultServlet = new DefaultServlet(resourceService);
-        context.addServlet(new ServletHolder(defaultServlet), "/");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
+            ResourceService resourceService = new ResourceService();
+            resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain"));
+            DefaultServlet defaultServlet = new DefaultServlet(resourceService);
+            context.addServlet(new ServletHolder(defaultServlet), "/");
+        });
 
         String rawResponse = connector.getResponse("""
             GET /context/ HTTP/1.1\r
@@ -2335,20 +2757,26 @@ public void testMemoryResourceMultipleRanges() throws Exception
     @Test
     public void testMemoryResourceRangeUsingBufferedHttpContent() throws Exception
     {
-        Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
-        ResourceService resourceService = new ResourceService();
-        resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain")
-        {
-            final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), null, false).getByteBuffer();
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
-            @Override
-            public ByteBuffer getByteBuffer()
+        startServer((context) ->
+        {
+            Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
+            ResourceService resourceService = new ResourceService();
+            resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain")
             {
-                return buffer;
-            }
+                final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), null, false).getByteBuffer();
+
+                @Override
+                public ByteBuffer getByteBuffer()
+                {
+                    return buffer;
+                }
+            });
+            DefaultServlet defaultServlet = new DefaultServlet(resourceService);
+            context.addServlet(new ServletHolder(defaultServlet), "/");
         });
-        DefaultServlet defaultServlet = new DefaultServlet(resourceService);
-        context.addServlet(new ServletHolder(defaultServlet), "/");
 
         String rawResponse = connector.getResponse("""
             GET /context/ HTTP/1.1\r
@@ -2366,20 +2794,26 @@ public ByteBuffer getByteBuffer()
     @Test
     public void testMemoryResourceMultipleRangesUsingBufferedHttpContent() throws Exception
     {
-        Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
-        ResourceService resourceService = new ResourceService();
-        resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain")
-        {
-            final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), null, false).getByteBuffer();
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
 
-            @Override
-            public ByteBuffer getByteBuffer()
+        startServer((context) ->
+        {
+            Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
+            ResourceService resourceService = new ResourceService();
+            resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain")
             {
-                return buffer;
-            }
+                final ByteBuffer buffer = IOResources.toRetainableByteBuffer(getResource(), null, false).getByteBuffer();
+
+                @Override
+                public ByteBuffer getByteBuffer()
+                {
+                    return buffer;
+                }
+            });
+            DefaultServlet defaultServlet = new DefaultServlet(resourceService);
+            context.addServlet(new ServletHolder(defaultServlet), "/");
         });
-        DefaultServlet defaultServlet = new DefaultServlet(resourceService);
-        context.addServlet(new ServletHolder(defaultServlet), "/");
 
         String rawResponse = connector.getResponse("""
             GET /context/ HTTP/1.1\r
@@ -2400,12 +2834,18 @@ public ByteBuffer getByteBuffer()
     @Test
     public void testNotAcceptRanges() throws Exception
     {
-        Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
-        ResourceService resourceService = new ResourceService();
-        resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain"));
-        resourceService.setAcceptRanges(false);
-        DefaultServlet defaultServlet = new DefaultServlet(resourceService);
-        context.addServlet(new ServletHolder(defaultServlet), "/");
+        Path docRoot = workDir.getEmptyPathDir().resolve("docroot");
+        FS.ensureDirExists(docRoot);
+
+        startServer((context) ->
+        {
+            Resource memResource = ResourceFactory.of(context).newMemoryResource(getClass().getResource("/contextResources/test.txt"));
+            ResourceService resourceService = new ResourceService();
+            resourceService.setHttpContentFactory(path -> new ResourceHttpContent(memResource, "text/plain"));
+            resourceService.setAcceptRanges(false);
+            DefaultServlet defaultServlet = new DefaultServlet(resourceService);
+            context.addServlet(new ServletHolder(defaultServlet), "/");
+        });
 
         String rawResponse = connector.getResponse("""
             GET /context/ HTTP/1.1\r
@@ -2423,11 +2863,6 @@ public void testNotAcceptRanges() throws Exception
 
     public static class OutputFilter implements Filter
     {
-        @Override
-        public void init(FilterConfig filterConfig)
-        {
-        }
-
         @Override
         public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
         {
@@ -2435,40 +2870,16 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             response.setCharacterEncoding("utf-8");
             chain.doFilter(request, response);
         }
-
-        @Override
-        public void destroy()
-        {
-        }
     }
 
     public static class WriterFilter implements Filter
     {
-        @Override
-        public void init(FilterConfig filterConfig)
-        {
-        }
-
         @Override
         public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
         {
             response.getWriter().println("Extra Info");
             chain.doFilter(request, response);
         }
-
-        @Override
-        public void destroy()
-        {
-        }
-    }
-
-    private void createFile(Path path, String str) throws IOException
-    {
-        try (OutputStream out = Files.newOutputStream(path))
-        {
-            out.write(str.getBytes(UTF_8));
-            out.flush();
-        }
     }
 
     private boolean deleteFile(Path file) throws IOException