Index: test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml	(revision 368829)
+++ test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml	(working copy)
@@ -85,7 +85,7 @@
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
         <property name="phoneNumbers">
 	        <map>
@@ -102,7 +102,7 @@
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>13</value></constructor-arg>
         <property name="phoneNumbers">
 	        <map>
                 <entry key="home"><value>3343</value></entry>
Index: test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml	(revision 368829)
+++ test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml	(working copy)
@@ -82,7 +82,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
         <property name="projects">
             <set>
@@ -98,7 +98,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13</value></constructor-arg>
         <property name="projects">
             <set>
                 <ref local="proj3"/>
Index: test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml	(revision 368829)
+++ test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml	(working copy)
@@ -144,7 +144,7 @@
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
         <property name="medicalInsurance"><ref bean="medicalIns3"/></property>
         <property name="dentalInsurance"><ref bean="dentalIns3"/></property>
@@ -175,7 +175,7 @@
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>13</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
         <property name="dentalInsurance"><ref bean="dentalIns4"/></property>
         <property name="phoneNumbers">
Index: test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml	(revision 368829)
+++ test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml	(working copy)
@@ -111,7 +111,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
         <property name="department"><ref bean="dept1"/></property>
         <property name="fundingDept"><ref bean="dept1"/></property>
@@ -125,7 +125,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13</value></constructor-arg>
         <property name="department"><ref bean="dept2"/></property>
         <property name="fundingDept"><ref bean="dept2"/></property>
         <property name="manager"><ref bean="emp2"/></property>
Index: test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml	(revision 368829)
+++ test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml	(working copy)
@@ -144,7 +144,7 @@
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
         <property name="medicalInsurance"><ref bean="medicalIns3"/></property>
         <property name="dentalInsurance"><ref bean="dentalIns3"/></property>
@@ -175,7 +175,7 @@
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>13</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
         <property name="dentalInsurance"><ref bean="dentalIns4"/></property>
         <property name="phoneNumbers">
Index: test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml	(revision 368829)
+++ test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml	(working copy)
@@ -69,7 +69,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
     </bean>
     <bean id="emp4" factory-bean="companyFactory" factory-method="newPartTimeEmployee">
@@ -79,7 +79,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13</value></constructor-arg>
     </bean>
     <bean id="emp5" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
Index: test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml	(revision 368829)
+++ test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml	(working copy)
@@ -73,7 +73,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
         <property name="medicalInsurance"><ref bean="medicalIns3"/></property>
         <property name="dentalInsurance"><ref bean="dentalIns3"/></property>
@@ -87,7 +87,7 @@
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
         <constructor-arg index="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
         <property name="dentalInsurance"><ref bean="dentalIns4"/></property>
         <property name="mentor"><ref bean="emp5"/></property>