Index: lams_common/build.xml
===================================================================
diff -u -r32e8aadaa935bdf558b1bd1efae9a12d7aff6413 -rfe4acb49960c15b037e3a7a33205ce46d3ec12a2
--- lams_common/build.xml	(.../build.xml)	(revision 32e8aadaa935bdf558b1bd1efae9a12d7aff6413)
+++ lams_common/build.xml	(.../build.xml)	(revision fe4acb49960c15b037e3a7a33205ce46d3ec12a2)
@@ -158,7 +158,7 @@
 	<target name="preparedirs">
 		<mkdir dir="${build}"/>
 		<mkdir dir="${build.classes}"/>
-		<mkdir dir="${build.classes.test}"/>
+		<mkdir dir="${build.test}"/>
 		<mkdir dir="${build.lib}"/>
 	</target>
 
@@ -182,14 +182,14 @@
 	</target>
 
 	<target name="compile.test" depends="compile">
-		<javac destdir="${build.classes.test}" compiler="modern">
+		<javac destdir="${build.test}" compiler="modern">
 			<src path="${src.test.java}"/>
 			<classpath>
 				<pathelement location="${build.classes}"/>
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
-		<copy overwrite="yes" todir="${build.classes.test}">
+		<copy overwrite="yes" todir="${build.test}">
 			<fileset dir="${src.test.java}">
 				<include name="**/*.xml"/>
 			</fileset>
@@ -198,11 +198,13 @@
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
-	<target name="lams-jar" depends="compile" description="creates jar file">
+	<target name="lams-jar" depends="compile,compile.test" description="creates jar file">
 		<delete file="${build.lib}/${product}.jar"/>
 		<jar jarfile="${build.lib}/${product}.jar">
 			<fileset dir="${build.classes}">
 			</fileset>
+			<fileset dir="${build.test}">
+			</fileset>			
 			<fileset dir="${hbm}">
 			</fileset>
 		</jar>
Index: lams_common/properties.xml
===================================================================
diff -u -race27572e9f3147af3e47b7890b6fa93f6e79bee -rfe4acb49960c15b037e3a7a33205ce46d3ec12a2
--- lams_common/properties.xml	(.../properties.xml)	(revision ace27572e9f3147af3e47b7890b6fa93f6e79bee)
+++ lams_common/properties.xml	(.../properties.xml)	(revision fe4acb49960c15b037e3a7a33205ce46d3ec12a2)
@@ -46,7 +46,7 @@
 	<property name="build"                         value="${basedir}/build"/>
 	<property name="build.classes"                 value="${build}/classes"/>
 	<property name="build.report"                 value="${build}/report"/>
-	<property name="build.classes.test"            value="${build}/classes/test"/>
+	<property name="build.test"            value="${build}/test"/>
 	
 	<property name="build.lib"                     value="${build}/lib"/>