diff --git a/indra-mongo/pom.xml b/indra-mongo/pom.xml
index 176a165..32a0561 100644
--- a/indra-mongo/pom.xml
+++ b/indra-mongo/pom.xml
@@ -26,21 +26,6 @@
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <indra.mongoURI>localhost:27017</indra.mongoURI>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/indra-service/README.md b/indra-service/README.md
index fb848ec..fed3c92 100644
--- a/indra-service/README.md
+++ b/indra-service/README.md
@@ -20,4 +20,4 @@ This is a REST Service that interfaces with the Java Indra Client.
 		"t2": "car",
 		"t1": "engine"
 	}]
-    }' "http://localhost:8916/indra/v1/relatedness"
\ No newline at end of file
+    }' "http://localhost:8916/relatedness"
\ No newline at end of file
diff --git a/indra-service/pom.xml b/indra-service/pom.xml
index b217980..792a41f 100644
--- a/indra-service/pom.xml
+++ b/indra-service/pom.xml
@@ -181,12 +181,23 @@
             <artifactId>indra-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.lambda3.indra</groupId>
             <artifactId>indra-mongo</artifactId>
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/indra-service/src/main/java/org/lambda3/indra/service/Server.java b/indra-service/src/main/java/org/lambda3/indra/service/Server.java
index a491dca..7ddb3fa 100644
--- a/indra-service/src/main/java/org/lambda3/indra/service/Server.java
+++ b/indra-service/src/main/java/org/lambda3/indra/service/Server.java
@@ -138,19 +138,19 @@ public synchronized void stop() {
         logger.info("Terminating Indra Service.");
         httpServer.shutdownNow();
         try {
-            spaceFactory.close();
+            if (spaceFactory != null) {
+                spaceFactory.close();
+            }
         } catch (IOException e) {
             logger.error("error closing the vector space factory.");
-            e.printStackTrace();
         } finally {
             try {
-                translatorFactory.close();
+                if (translatorFactory != null) {
+                    translatorFactory.close();
+                }
             } catch (IOException e) {
                 logger.error("error closing the translator factory.");
-                e.printStackTrace();
             }
         }
     }
-
-
 }
diff --git a/pom.xml b/pom.xml
index bb7e209..60a485c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,8 @@
         <slf4j-version>1.7.12</slf4j-version>
         <lucene.version>7.1.0</lucene.version>
         <license.licenseName>mit</license.licenseName>
+        <jackson.version>2.9.7</jackson.version>
+        <jaxb.version>2.3.2</jaxb.version>
     </properties>
 
     <profiles>
@@ -182,20 +184,6 @@
                     <version>2.20</version>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.20</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>integration-test</goal>
-                                <goal>verify</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
@@ -249,6 +237,17 @@
                 <version>${lucene.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>