diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..71556c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+target/
+.settings/
+.vscode/
+.classpath
+.project
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d74abd2..413ad79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,19 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
+        </plugins>
+    </build>
+
     <!-- Dependencies -->
     <dependencies>
         <dependency>
@@ -41,7 +54,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>RELEASE</version>
+            <version>5.7.2</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java b/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java
index a9fafe6..7fb5db8 100644
--- a/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java
+++ b/src/main/java/com/coderfromscratch/httpserver/core/ServerListenerThread.java
@@ -4,8 +4,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 
diff --git a/src/test/java/com/coderfromscratch/http/HttpParserTest.java b/src/test/java/com/coderfromscratch/http/HttpParserTest.java
index 1a5a867..cea48c1 100644
--- a/src/test/java/com/coderfromscratch/http/HttpParserTest.java
+++ b/src/test/java/com/coderfromscratch/http/HttpParserTest.java
@@ -32,93 +32,93 @@ void parseHttpRequest() {
         }
 
         assertNotNull(request);
-        assertEquals(request.getMethod(), HttpMethod.GET);
-        assertEquals(request.getRequestTarget(), "/");
-        assertEquals(request.getOriginalHttpVersion(), "HTTP/1.1");
-        assertEquals(request.getBestCompatibleHttpVersion(), HttpVersion.HTTP_1_1);
+        assertEquals(HttpMethod.GET, request.getMethod());
+        assertEquals("/", request.getRequestTarget());
+        assertEquals("HTTP/1.1", request.getOriginalHttpVersion());
+        assertEquals(HttpVersion.HTTP_1_1, request.getBestCompatibleHttpVersion());
     }
 
     @Test
     void parseHttpRequestBadMethod1() {
         try {
-            HttpRequest request = httpParser.parseHttpRequest(
+            httpParser.parseHttpRequest(
                     generateBadTestCaseMethodName1()
             );
             fail();
         } catch (HttpParsingException e) {
-            assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED);
+            assertEquals(HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED, e.getErrorCode());
         }
     }
 
     @Test
     void parseHttpRequestBadMethod2() {
         try {
-            HttpRequest request = httpParser.parseHttpRequest(
+            httpParser.parseHttpRequest(
                     generateBadTestCaseMethodName2()
             );
             fail();
         } catch (HttpParsingException e) {
-            assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED);
+            assertEquals(HttpStatusCode.SERVER_ERROR_501_NOT_IMPLEMENTED, e.getErrorCode());
         }
     }
 
     @Test
     void parseHttpRequestInvNumItems1() {
         try {
-            HttpRequest request = httpParser.parseHttpRequest(
+            httpParser.parseHttpRequest(
                     generateBadTestCaseRequestLineInvNumItems1()
             );
             fail();
         } catch (HttpParsingException e) {
-            assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
+            assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
         }
     }
 
     @Test
     void parseHttpEmptyRequestLine() {
         try {
-            HttpRequest request = httpParser.parseHttpRequest(
+            httpParser.parseHttpRequest(
                     generateBadTestCaseEmptyRequestLine()
             );
             fail();
         } catch (HttpParsingException e) {
-            assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
+            assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
         }
     }
 
     @Test
     void parseHttpRequestLineCRnoLF() {
         try {
-            HttpRequest request = httpParser.parseHttpRequest(
+            httpParser.parseHttpRequest(
                     generateBadTestCaseRequestLineOnlyCRnoLF()
             );
             fail();
         } catch (HttpParsingException e) {
-            assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
+            assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
         }
     }
 
     @Test
     void parseHttpRequestBadHttpVersion() {
         try {
-            HttpRequest request = httpParser.parseHttpRequest(
+            httpParser.parseHttpRequest(
                     generateBadHttpVersionTestCase()
             );
             fail();
         } catch (HttpParsingException e) {
-            assertEquals(e.getErrorCode(), HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST);
+            assertEquals(HttpStatusCode.CLIENT_ERROR_400_BAD_REQUEST, e.getErrorCode());
         }
     }
 
     @Test
     void parseHttpRequestUnsupportedHttpVersion() {
         try {
-            HttpRequest request = httpParser.parseHttpRequest(
+            httpParser.parseHttpRequest(
                     generateUnsuportedHttpVersionTestCase()
             );
             fail();
         } catch (HttpParsingException e) {
-            assertEquals(e.getErrorCode(), HttpStatusCode.SERVER_ERROR_505_HTTP_VERSION_NOT_SUPPORTED);
+            assertEquals(HttpStatusCode.SERVER_ERROR_505_HTTP_VERSION_NOT_SUPPORTED, e.getErrorCode());
         }
     }
 
@@ -129,8 +129,8 @@ void parseHttpRequestSupportedHttpVersion1() {
                     generateSupportedHttpVersion1()
             );
             assertNotNull(request);
-            assertEquals(request.getBestCompatibleHttpVersion(), HttpVersion.HTTP_1_1);
-            assertEquals(request.getOriginalHttpVersion(), "HTTP/1.2");
+            assertEquals(HttpVersion.HTTP_1_1, request.getBestCompatibleHttpVersion());
+            assertEquals("HTTP/1.2", request.getOriginalHttpVersion());
         } catch (HttpParsingException e) {
             fail();
         }
diff --git a/src/test/java/com/coderfromscratch/http/HttpVersionTest.java b/src/test/java/com/coderfromscratch/http/HttpVersionTest.java
index eec0460..52aaef3 100644
--- a/src/test/java/com/coderfromscratch/http/HttpVersionTest.java
+++ b/src/test/java/com/coderfromscratch/http/HttpVersionTest.java
@@ -15,14 +15,13 @@ void getBestCompatibleVersionExactMatch() {
             fail();
         }
         assertNotNull(version);
-        assertEquals(version, HttpVersion.HTTP_1_1);
+        assertEquals(HttpVersion.HTTP_1_1, version);
     }
 
     @Test
     void getBestCompatibleVersionBadFormat() {
-        HttpVersion version = null;
         try {
-            version = HttpVersion.getBestCompatibleVersion("http/1.1");
+            HttpVersion.getBestCompatibleVersion("http/1.1");
             fail();
         } catch (BadHttpVersionException e) {
 
@@ -35,7 +34,7 @@ void getBestCompatibleVersionHigherVersion() {
         try {
             version = HttpVersion.getBestCompatibleVersion("HTTP/1.2");
             assertNotNull(version);
-            assertEquals(version, HttpVersion.HTTP_1_1);
+            assertEquals(HttpVersion.HTTP_1_1, version);
         } catch (BadHttpVersionException e) {
             fail();
         }