diff --git a/build.xml b/build.xml
index 783c08a..a03ea2e 100644
--- a/build.xml
+++ b/build.xml
@@ -11,18 +11,20 @@
 	<property name="resources" value="resources"/>
 	<property name="debug" value="on"/>
 				
-	<target name="all" depends="compile,xid_dist,examples" />
+	<target name="all" depends="build,xid_dist,build_test,examples" />
 					
 	<!-- ******* Init ******* -->
 	<target name="init">
 		<tstamp/>
 		<mkdir dir="${build}"/>
+		<mkdir dir="build_test/classes"/>
 		<mkdir dir="${build}/classes"/>
 		<mkdir dir="${dist}"/>
 	</target>
 
-	<!-- ******* Compile ******* -->
-	<target name="compile" depends="init">
+
+	<!-- ******* build ******* -->
+	<target name="build" depends="init">
 		<javac srcdir="${src}" destdir="${build}/classes" debug="${debug}" deprecation="on">
 			<classpath>
 				<fileset dir="lib" includes="**/*.jar"/>
@@ -30,15 +32,45 @@
 		</javac>
 	</target>
 
-	<!-- ****** xid.jar ****** -->
-	<target name="xid_dist" depends="compile">
+
+	<!-- ****** xid_dist ****** -->
+	<target name="xid_dist" depends="build">
 		<jar update="no" jarfile="dist/xid.jar">
-			<fileset dir="build/classes" includes="xid/**/**.class" />
+			<fileset dir="build/classes" includes="xid/**.class" />
 			<fileset dir="resources" includes="**" />
 		</jar>
 	</target>	
 
 
+	<!-- ******* build_test ******* -->
+	<target name="build_test" depends="xid_dist">
+		<javac srcdir="test" destdir="build_test/classes" debug="${debug}" deprecation="on">
+			<classpath>
+				<fileset dir="lib" includes="**/*.jar"/>
+		        </classpath>
+		</javac>
+	</target>
+
+	<!-- ****** test_dist ****** -->
+	<target name="test_dist" depends="build_test">
+		<jar update="no" jarfile="dist/test.jar">
+			<fileset dir="build_test/classes" includes="xid/test/**.class" />
+			<fileset dir="resources" includes="**" />
+		</jar>
+	</target>	
+
+	<!-- *********** dotest ******** -->
+	<target name="dotest" depends="test_dist">
+	        <java  classname="xid.test.Test" maxmemory="20m" fork="true">
+			<classpath>
+				<fileset dir="lib" includes="**/*.jar" />
+				<pathelement path="dist/xid.jar"/>
+				<pathelement path="dist/test.jar"/>
+			</classpath>
+		</java>
+	</target>
+
+
 	<!-- ******* Examples (the webapp). ******* -->
 	<target name="examples" depends="xid_dist">
 
@@ -63,7 +95,7 @@
 
 
 	<!-- ****** JavaDoc ****** -->
-	<target name="javadoc" depends="compile">
+	<target name="javadoc" depends="build">
 		<javadoc sourcepath="${src}" packageNames="xid.*" destdir="${doc}">
 			<classpath>
 				<fileset dir="lib" includes="**/*.jar"/>
@@ -75,6 +107,7 @@
 	<!-- *************** Clean ***********************-->
 	<target name="clean">
 		<delete dir="${build}"/>
+		<delete dir="build_test"/>
 	</target>
 
 	<!-- *********** Produce ZIP release file ******** -->
diff --git a/dist/xid.jar b/dist/xid.jar
index 4b5fbe2..90ada0b 100644
Binary files a/dist/xid.jar and b/dist/xid.jar differ
diff --git a/test/xid/Test.java b/test/xid/Test.java
deleted file mode 100644
index e616816..0000000
--- a/test/xid/Test.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package xid.test;
-
-import java.util.*;
-import java.io.*;
-
-
-/**
- *
- */
-class Test
-{
-  public static void main(String[] args)
-  {
-    System.out.println("Hello World!");
-  }
-}
diff --git a/webapp-examples/WEB-INF/lib/xid.jar b/webapp-examples/WEB-INF/lib/xid.jar
index 4b5fbe2..9fb73b7 100644
Binary files a/webapp-examples/WEB-INF/lib/xid.jar and b/webapp-examples/WEB-INF/lib/xid.jar differ