diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java b/infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java
index 82b7b1361..c13ea821e 100644
--- a/infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java
+++ b/infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java
@@ -17,7 +17,6 @@ package org.springframework.batch.io.driving;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.batch.io.sample.domain.Foo;
diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java b/infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java
index 660ecb46c..156e5615d 100644
--- a/infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java
+++ b/infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java
@@ -202,7 +202,7 @@ public class DrivingQueryInputSourceTests extends TestCase {
 
 		public List restoreKeys(RestartData restartData) {
 			
-			assertEquals(this.restartData, restartData);
+			assertEquals(MockKeyGenerator.restartData, restartData);
 			return restartKeys;
 		}
 
diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java b/infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java
index 93b8e9a37..858384abf 100644
--- a/infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java
+++ b/infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java
@@ -1,7 +1,6 @@
 package org.springframework.batch.io.driving;
 
 import org.springframework.batch.io.InputSource;
-import org.springframework.batch.io.driving.DrivingQueryInputSource;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.batch.restart.Restartable;
 import org.springframework.beans.factory.DisposableBean;
diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java b/infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java
index 59aef0c7e..e359b02bc 100644
--- a/infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java
+++ b/infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java
@@ -16,7 +16,6 @@
 package org.springframework.batch.io.driving;
 
 import org.springframework.batch.io.InputSource;
-import org.springframework.batch.io.driving.DrivingQueryInputSource;
 import org.springframework.batch.io.driving.support.MultipleColumnJdbcKeyGenerator;
 import org.springframework.batch.io.sql.AbstractSqlInputSourceIntegrationTests;
 
diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java b/infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java
index bf9ce92e9..6b39faaa5 100644
--- a/infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java
+++ b/infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java
@@ -1,7 +1,6 @@
 package org.springframework.batch.io.driving;
 
 import org.springframework.batch.io.InputSource;
-import org.springframework.batch.io.driving.DrivingQueryInputSource;
 import org.springframework.batch.io.driving.support.SingleColumnJdbcKeyGenerator;
 import org.springframework.batch.io.sql.AbstractSqlInputSourceIntegrationTests;
 
diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java b/infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java
index 7d9451bd8..c733712a9 100644
--- a/infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java
+++ b/infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java
@@ -11,12 +11,10 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.driving.support.ColumnMapRestartDataRowMapper;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.core.CollectionFactory;
 import org.springframework.jdbc.core.PreparedStatementSetter;
-import org.springframework.jdbc.core.SqlTypeValue;
 import org.springframework.util.ClassUtils;
 
 /**