diff --git a/build.xml b/build.xml
index 9fef0513..3ef8c47a 100644
--- a/build.xml
+++ b/build.xml
@@ -44,7 +44,7 @@
         <pathelement location="lib/byte-buddy-1.5.0.jar" /> <!-- only needed for tests compile and run -->
         <pathelement location="lib/byte-buddy-agent-1.5.0.jar" /> <!-- only needed for tests compile and run -->
         <pathelement location="lib/objenesis-2.4.jar" /> <!-- only needed for tests compile and run -->
-        <pathelement location="lib/jdom2-2.0.6.jar" />
+        <pathelement location="lib/jdom2-2.0.6.1.jar" />
         <pathelement location="lib/jlfgr-1_0.jar" />
         <pathelement location="lib/jcip-annotations-1.0.jar" /> <!-- only needed for compile -->
         <pathelement location="lib/jsr305.jar" /> <!-- only needed for compile -->
@@ -183,6 +183,35 @@
         </fail>
     </target>
 
+    <target name="singletest" depends="compile, tests" description="build and run one test file (edited in build.xml)">
+        <mkdir dir="${testreporttarget}"/>
+        <junit haltonerror="false" haltonfailure="false" showoutput="yes" printsummary="yes" fork="yes" dir="." timeout="3600000" errorProperty="test.failed" failureProperty="test.failed">
+            <classpath refid="project.class.path"    />
+            <sysproperty key="java.security.policy" value="lib/security.policy"/> 
+            <sysproperty key="java.library.path" path=".:lib/"/>       
+            <formatter type="xml"/>
+            <test name="org.openlcb.implementations.LocationServiceUtilsTest"/>
+<!-- 
+            <test name="org.openlcb.ProducerConsumerEventReportMessageTest"/>
+            <test name="org.openlcb.can.MessageBuilderTest"/>
+            <test name="org.openlcb.DatagramAcknowledgedMessageTest"/>
+ -->
+        </junit>
+        <fail>
+            <condition>
+                <istrue value="${test.failed}" />
+            </condition>
+        </fail>
+    </target>
+
+    <target name="singledemo" depends="compile, tests" description="build and run one demo file (edited in build.xml)">
+        <java fork="yes" classname="org.openlcb.cdi.swing.CdiPanelDemo">
+            <classpath refid="project.class.path"    />
+            <sysproperty key="java.security.policy" value="lib/security.policy"/> 
+            <sysproperty key="java.library.path" path=".:lib/"/>       
+        </java>
+    </target>
+
     <target name="run-coverage" depends="compile, tests" description="build and run test suite, generating coverage report.">
         <mkdir dir="${testreporttarget}"/>
         <jacoco:coverage destfile="jacoco.exec" excludes="org.slf4j.*">
diff --git a/lib/README b/lib/README
index 97473a5a..d4ccf11b 100644
--- a/lib/README
+++ b/lib/README
@@ -5,7 +5,7 @@ Contents:
 
 Specific components:
 
-jdom-2.0.6.jar
+jdom-2.0.6.1.jar
  Used for testing only, not in main jar
  from <jdom.org>
 
diff --git a/lib/jdom2-2.0.6.1.jar b/lib/jdom2-2.0.6.1.jar
new file mode 100644
index 00000000..da958396
Binary files /dev/null and b/lib/jdom2-2.0.6.1.jar differ
diff --git a/lib/jdom2-2.0.6.jar b/lib/jdom2-2.0.6.jar
deleted file mode 100644
index 2850ca10..00000000
Binary files a/lib/jdom2-2.0.6.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 47883772..93000053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.jdom</groupId>
             <artifactId>jdom2</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.6.1</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>