diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
index cadfcbc7..5a6f3277 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterFactoryTests.java
@@ -112,7 +112,7 @@ public class ConverterFactoryTests {
 				assertEquals(testData.canConvert,
 						converterManager.canConvert(testData.fromClass, testData.syntax, testData.toClass));
 			}
-		}, converterTestData);
+		}, this.converterTestData);
 	}
 
 }
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
index a2375f90..7b5e9b20 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java
@@ -39,34 +39,34 @@ public final class ConverterManagerTests {
 
 	@Before
 	public void setUp() {
-		converterManager = new ConverterManagerImpl();
+		this.converterManager = new ConverterManagerImpl();
 
 		Converter ptc = new FromStringConverter();
-		converterManager.addConverter(String.class, "", Byte.class, ptc);
-		converterManager.addConverter(String.class, "", Short.class, ptc);
-		converterManager.addConverter(String.class, "", Integer.class, ptc);
-		converterManager.addConverter(String.class, "", Long.class, ptc);
-		converterManager.addConverter(String.class, "", Double.class, ptc);
-		converterManager.addConverter(String.class, "", Float.class, ptc);
-		converterManager.addConverter(String.class, "", Boolean.class, ptc);
+		this.converterManager.addConverter(String.class, "", Byte.class, ptc);
+		this.converterManager.addConverter(String.class, "", Short.class, ptc);
+		this.converterManager.addConverter(String.class, "", Integer.class, ptc);
+		this.converterManager.addConverter(String.class, "", Long.class, ptc);
+		this.converterManager.addConverter(String.class, "", Double.class, ptc);
+		this.converterManager.addConverter(String.class, "", Float.class, ptc);
+		this.converterManager.addConverter(String.class, "", Boolean.class, ptc);
 
 		Converter tsc = new ToStringConverter();
-		converterManager.addConverter(Byte.class, "", String.class, tsc);
-		converterManager.addConverter(Short.class, "", String.class, tsc);
-		converterManager.addConverter(Integer.class, "", String.class, tsc);
-		converterManager.addConverter(Long.class, "", String.class, tsc);
-		converterManager.addConverter(Double.class, "", String.class, tsc);
-		converterManager.addConverter(Float.class, "", String.class, tsc);
-		converterManager.addConverter(Boolean.class, "", String.class, tsc);
+		this.converterManager.addConverter(Byte.class, "", String.class, tsc);
+		this.converterManager.addConverter(Short.class, "", String.class, tsc);
+		this.converterManager.addConverter(Integer.class, "", String.class, tsc);
+		this.converterManager.addConverter(Long.class, "", String.class, tsc);
+		this.converterManager.addConverter(Double.class, "", String.class, tsc);
+		this.converterManager.addConverter(Float.class, "", String.class, tsc);
+		this.converterManager.addConverter(Boolean.class, "", String.class, tsc);
 
 		Converter uric = new UriConverter();
-		converterManager.addConverter(URI.class, "", String.class, uric);
-		converterManager.addConverter(String.class, "", URI.class, uric);
+		this.converterManager.addConverter(URI.class, "", String.class, uric);
+		this.converterManager.addConverter(String.class, "", URI.class, uric);
 	}
 
 	@After
 	public void tearDown() {
-		converterManager = null;
+		this.converterManager = null;
 	}
 
 	private static class ConverterTestData<T> {
@@ -92,8 +92,8 @@ public final class ConverterManagerTests {
 
 		@Override
 		public String toString() {
-			return String.format("sourceData=%1$s | syntax=%2$s | destClass=%3$s | expectedValue=%4$s", sourceData,
-					syntax, destClass, expectedValue);
+			return String.format("sourceData=%1$s | syntax=%2$s | destClass=%3$s | expectedValue=%4$s", this.sourceData,
+					this.syntax, this.destClass, this.expectedValue);
 		}
 
 	}
@@ -130,8 +130,8 @@ public final class ConverterManagerTests {
 
 		new ExecuteRunnable<ConverterTestData<?>>().runTests(new RunnableTests<ConverterTestData<?>>() {
 			public void runTest(ConverterTestData<?> testData) {
-				assertEquals(testData.expectedValue,
-						converterManager.convert(testData.sourceData, "", testData.destClass));
+				assertEquals(testData.expectedValue, ConverterManagerTests.this.converterManager
+						.convert(testData.sourceData, "", testData.destClass));
 			}
 		}, primitiveTypeTests);
 	}
@@ -188,11 +188,11 @@ public final class ConverterManagerTests {
 	@Test
 	public void syntaxBasedConversion() throws Exception {
 		Converter squaredConverter = new SquaredConverter();
-		converterManager.addConverter(String.class, "1", Integer.class, squaredConverter);
-		converterManager.addConverter(Integer.class, "1", Integer.class, squaredConverter);
+		this.converterManager.addConverter(String.class, "1", Integer.class, squaredConverter);
+		this.converterManager.addConverter(Integer.class, "1", Integer.class, squaredConverter);
 		Converter cubedConverter = new CubedConverter();
-		converterManager.addConverter(String.class, "2", Integer.class, cubedConverter);
-		converterManager.addConverter(Integer.class, "3", Integer.class, cubedConverter);
+		this.converterManager.addConverter(String.class, "2", Integer.class, cubedConverter);
+		this.converterManager.addConverter(Integer.class, "3", Integer.class, cubedConverter);
 
 		final ConverterTestData<?>[] syntaxTests = new ConverterTestData<?>[] {
 				new ConverterTestData<Integer>("3", "", Integer.class, Integer.valueOf(3)),
@@ -210,8 +210,8 @@ public final class ConverterManagerTests {
 
 		new ExecuteRunnable<ConverterTestData<?>>().runTests(new RunnableTests<ConverterTestData<?>>() {
 			public void runTest(ConverterTestData<?> testData) {
-				assertEquals(testData.expectedValue,
-						converterManager.convert(testData.sourceData, testData.syntax, testData.destClass));
+				assertEquals(testData.expectedValue, ConverterManagerTests.this.converterManager
+						.convert(testData.sourceData, testData.syntax, testData.destClass));
 			}
 		}, syntaxTests);
 
@@ -220,13 +220,13 @@ public final class ConverterManagerTests {
 	// No converter for classes
 	@Test(expected = ConverterException.class)
 	public void noClassConverter() throws Exception {
-		converterManager.convert(BitSet.class, "", Integer.class);
+		this.converterManager.convert(BitSet.class, "", Integer.class);
 	}
 
 	// Invalid syntax so converter fails
 	@Test(expected = ConverterException.class)
 	public void invalidSyntax() throws Exception {
-		converterManager.convert(String.class, "not a uri", URI.class);
+		this.converterManager.convert(String.class, "not a uri", URI.class);
 	}
 
 }
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
index 14d334ef..e113745d 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java
@@ -30,14 +30,14 @@ public class JDependTests {
 
 	@Before
 	public void setUp() throws IOException {
-		jdepend = new JDepend();
-		jdepend.addDirectory("build/classes/java/main");
+		this.jdepend = new JDepend();
+		this.jdepend.addDirectory("build/classes/java/main");
 	}
 
 	@Test
 	public void testAllPackages() {
-		jdepend.analyze();
-		assertEquals(false, jdepend.containsCycles());
+		this.jdepend.analyze();
+		assertEquals(false, this.jdepend.containsCycles());
 	}
 
 }
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
index 1060f807..6b8a5f31 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/LdapTests.java
@@ -159,38 +159,38 @@ public final class LdapTests {
 	// an integration test
 	public void setUp(String url, String username, String password) throws Exception {
 		// Create some basic converters and a converter manager
-		converterManager = new ConverterManagerImpl();
+		this.converterManager = new ConverterManagerImpl();
 
 		Converter ptc = new FromStringConverter();
-		converterManager.addConverter(String.class, "", Byte.class, ptc);
-		converterManager.addConverter(String.class, "", Short.class, ptc);
-		converterManager.addConverter(String.class, "", Integer.class, ptc);
-		converterManager.addConverter(String.class, "", Long.class, ptc);
-		converterManager.addConverter(String.class, "", Double.class, ptc);
-		converterManager.addConverter(String.class, "", Float.class, ptc);
-		converterManager.addConverter(String.class, "", Boolean.class, ptc);
+		this.converterManager.addConverter(String.class, "", Byte.class, ptc);
+		this.converterManager.addConverter(String.class, "", Short.class, ptc);
+		this.converterManager.addConverter(String.class, "", Integer.class, ptc);
+		this.converterManager.addConverter(String.class, "", Long.class, ptc);
+		this.converterManager.addConverter(String.class, "", Double.class, ptc);
+		this.converterManager.addConverter(String.class, "", Float.class, ptc);
+		this.converterManager.addConverter(String.class, "", Boolean.class, ptc);
 
 		Converter tsc = new ToStringConverter();
-		converterManager.addConverter(Byte.class, "", String.class, tsc);
-		converterManager.addConverter(Short.class, "", String.class, tsc);
-		converterManager.addConverter(Integer.class, "", String.class, tsc);
-		converterManager.addConverter(Long.class, "", String.class, tsc);
-		converterManager.addConverter(Double.class, "", String.class, tsc);
-		converterManager.addConverter(Float.class, "", String.class, tsc);
-		converterManager.addConverter(Boolean.class, "", String.class, tsc);
+		this.converterManager.addConverter(Byte.class, "", String.class, tsc);
+		this.converterManager.addConverter(Short.class, "", String.class, tsc);
+		this.converterManager.addConverter(Integer.class, "", String.class, tsc);
+		this.converterManager.addConverter(Long.class, "", String.class, tsc);
+		this.converterManager.addConverter(Double.class, "", String.class, tsc);
+		this.converterManager.addConverter(Float.class, "", String.class, tsc);
+		this.converterManager.addConverter(Boolean.class, "", String.class, tsc);
 
 		// Bind to the directory
-		contextSource = getContextSource(url, username, password);
+		this.contextSource = getContextSource(url, username, password);
 
 		// Clear out any old data - and load the test data
-		LdapTestUtils.cleanAndSetup(contextSource, baseName, new ClassPathResource("testdata.ldif"));
+		LdapTestUtils.cleanAndSetup(this.contextSource, baseName, new ClassPathResource("testdata.ldif"));
 
 		// Create our OdmManager
 		Set<Class<?>> managedClasses = new HashSet<Class<?>>();
 		managedClasses.add(Person.class);
 		managedClasses.add(PlainPerson.class);
 		managedClasses.add(OrganizationalUnit.class);
-		odmManager = new OdmManagerImpl(converterManager, contextSource, managedClasses);
+		this.odmManager = new OdmManagerImpl(this.converterManager, this.contextSource, managedClasses);
 	}
 
 	@Before
@@ -200,11 +200,11 @@ public final class LdapTests {
 
 	@After
 	public void tearDown() throws Exception {
-		LdapTestUtils.clearSubContexts(contextSource, baseName);
+		LdapTestUtils.clearSubContexts(this.contextSource, baseName);
 
-		odmManager = null;
-		contextSource = null;
-		converterManager = null;
+		this.odmManager = null;
+		this.contextSource = null;
+		this.converterManager = null;
 	}
 
 	private enum PersonName {
@@ -218,7 +218,7 @@ public final class LdapTests {
 		}
 
 		public int getIndex() {
-			return index;
+			return this.index;
 		}
 
 	}
@@ -248,11 +248,11 @@ public final class LdapTests {
 			public void runTest(Person testData) {
 				Name dn = testData.getDn();
 				LOG.debug(String.format("reading - %1$s", dn));
-				Person personEntry = odmManager.read(Person.class, dn);
+				Person personEntry = LdapTests.this.odmManager.read(Person.class, dn);
 				LOG.debug(String.format("read - %1$s", personEntry));
 				assertEquals(testData, personEntry);
 			}
-		}, personTestData);
+		}, this.personTestData);
 	}
 
 	private static class SearchTestData {
@@ -272,14 +272,15 @@ public final class LdapTests {
 	}
 
 	private SearchTestData[] searchTestData = {
-			new SearchTestData("(sn=Unknown)", searchControls,
-					new Person[] { personTestData[PersonName.DAVROS.getIndex()],
-							personTestData[PersonName.MASTER.getIndex()] }),
-			new SearchTestData("(description=*Doctor)", searchControls,
-					new Person[] { personTestData[PersonName.WILLIAM.getIndex()],
-							personTestData[PersonName.PATRICK.getIndex()], personTestData[PersonName.JON.getIndex()],
-							personTestData[PersonName.TOM.getIndex()],
-							personTestData[PersonName.PETER.getIndex()] }), };
+			new SearchTestData("(sn=Unknown)", this.searchControls,
+					new Person[] { this.personTestData[PersonName.DAVROS.getIndex()],
+							this.personTestData[PersonName.MASTER.getIndex()] }),
+			new SearchTestData("(description=*Doctor)", this.searchControls,
+					new Person[] { this.personTestData[PersonName.WILLIAM.getIndex()],
+							this.personTestData[PersonName.PATRICK.getIndex()],
+							this.personTestData[PersonName.JON.getIndex()],
+							this.personTestData[PersonName.TOM.getIndex()],
+							this.personTestData[PersonName.PETER.getIndex()] }), };
 
 	// Carry out various searches against the test data set and check the results are what
 	// we'd expect.
@@ -289,11 +290,12 @@ public final class LdapTests {
 			public void runTest(SearchTestData testData) {
 				String search = testData.search;
 				LOG.debug(String.format("searching - %1$s", search));
-				List<Person> results = odmManager.search(Person.class, baseName, testData.search, testData.searchScope);
+				List<Person> results = LdapTests.this.odmManager.search(Person.class, baseName, testData.search,
+						testData.searchScope);
 				LOG.debug(String.format("found - %1$s", results));
 				assertEquals(new HashSet<Person>(Arrays.asList(testData.people)), new HashSet<Person>(results));
 			}
-		}, searchTestData);
+		}, this.searchTestData);
 	}
 
 	private enum OrganizationalName {
@@ -307,7 +309,7 @@ public final class LdapTests {
 		}
 
 		public int getIndex() {
-			return index;
+			return this.index;
 		}
 
 	}
@@ -323,14 +325,15 @@ public final class LdapTests {
 	@Test
 	public void testSecondOc() {
 		LOG.debug("Reading all organizatinalUnits");
-		List<OrganizationalUnit> allOus = odmManager.findAll(OrganizationalUnit.class, baseName, searchControls);
+		List<OrganizationalUnit> allOus = this.odmManager.findAll(OrganizationalUnit.class, baseName,
+				this.searchControls);
 		LOG.debug(String.format("Found - %1$s", allOus));
 		assertEquals(new HashSet<OrganizationalUnit>(Arrays.asList(ouTestData)),
 				new HashSet<OrganizationalUnit>(allOus));
 
 		OrganizationalUnit testOu = ouTestData[OrganizationalName.ASSISTANTS.getIndex()];
 		LOG.debug(String.format("Reading - %1$s", testOu.getDn()));
-		OrganizationalUnit ou = odmManager.read(OrganizationalUnit.class, testOu.getDn());
+		OrganizationalUnit ou = this.odmManager.read(OrganizationalUnit.class, testOu.getDn());
 		LOG.debug(String.format("Found - %1$s", ou));
 		assertEquals(testOu, ou);
 	}
@@ -340,14 +343,14 @@ public final class LdapTests {
 	@Test
 	public void findAll() throws Exception {
 		LOG.debug("finding all people");
-		List<Person> allPeople = odmManager.findAll(Person.class, baseName, searchControls);
+		List<Person> allPeople = this.odmManager.findAll(Person.class, baseName, this.searchControls);
 		LOG.debug(String.format("found %1$s", allPeople));
-		assertEquals(new HashSet<Person>(Arrays.asList(personTestData)), new HashSet<Person>(allPeople));
+		assertEquals(new HashSet<Person>(Arrays.asList(this.personTestData)), new HashSet<Person>(allPeople));
 	}
 
 	@Test
 	public void findAllAsPlainPersons() {
-		List<PlainPerson> allPeople = odmManager.findAll(PlainPerson.class, baseName, searchControls);
+		List<PlainPerson> allPeople = this.odmManager.findAll(PlainPerson.class, baseName, this.searchControls);
 
 		assertEquals(9, allPeople.size());
 		assertFalse("No nulls should have been returned", CollectionUtils.containsInstance(allPeople, null));
@@ -355,8 +358,8 @@ public final class LdapTests {
 
 	@Test
 	public void verifySearchOnPlainPerson() {
-		List<PlainPerson> result = odmManager.search(PlainPerson.class, baseName, "(cn=William Hartnell)",
-				searchControls);
+		List<PlainPerson> result = this.odmManager.search(PlainPerson.class, baseName, "(cn=William Hartnell)",
+				this.searchControls);
 		assertEquals(1, result.size());
 
 		PlainPerson foundPerson = result.get(0);
@@ -366,7 +369,7 @@ public final class LdapTests {
 
 	@Test
 	public void verifySearchWithLdapQuery() {
-		List<Person> result = odmManager.search(Person.class,
+		List<Person> result = this.odmManager.search(Person.class,
 				query().base(baseName).where("cn").is("William Hartnell"));
 		assertEquals(1, result.size());
 
@@ -377,16 +380,17 @@ public final class LdapTests {
 
 	@Test
 	public void updatePlainPerson() {
-		List<PlainPerson> result = odmManager.search(PlainPerson.class, baseName, "(cn=William Hartnell)",
-				searchControls);
+		List<PlainPerson> result = this.odmManager.search(PlainPerson.class, baseName, "(cn=William Hartnell)",
+				this.searchControls);
 		assertEquals(1, result.size());
 
 		PlainPerson foundPerson = result.get(0);
 		foundPerson.setSurname("Tjolahopp");
-		odmManager.update(foundPerson);
+		this.odmManager.update(foundPerson);
 
 		// Verify that the objectclass was not changed on the target object
-		List<Person> updatedResult = odmManager.search(Person.class, baseName, "(cn=William Hartnell)", searchControls);
+		List<Person> updatedResult = this.odmManager.search(Person.class, baseName, "(cn=William Hartnell)",
+				this.searchControls);
 		assertEquals(1, updatedResult.size());
 	}
 
@@ -401,64 +405,64 @@ public final class LdapTests {
 	// Create some entries, read them back and check they are what we'd expect.
 	@Test
 	public void create() throws Exception {
-		for (Person person : createTestData) {
+		for (Person person : this.createTestData) {
 			LOG.debug(String.format("creating - %1$s", person));
-			odmManager.create(person);
+			this.odmManager.create(person);
 		}
 		LOG.debug("Created all, reading back");
 		new ExecuteRunnable<Person>().runTests(new RunnableTests<Person>() {
 			public void runTest(Person testData) {
 				Name dn = testData.getDn();
 				LOG.debug(String.format("reading - %1$s", dn));
-				Person personEntry = odmManager.read(Person.class, dn);
+				Person personEntry = LdapTests.this.odmManager.read(Person.class, dn);
 				LOG.debug(String.format("read - %1$s", personEntry));
 				assertEquals(testData, personEntry);
 			}
-		}, createTestData);
+		}, this.createTestData);
 	}
 
 	// Update an entry from the test data set, read it back and check it is what we'd
 	// expect.
 	@Test
 	public void update() throws Exception {
-		Person william = personTestData[PersonName.WILLIAM.getIndex()];
+		Person william = this.personTestData[PersonName.WILLIAM.getIndex()];
 		william.setTelephoneNumber(666);
 		william.setSurname("Harvey");
-		odmManager.update(william);
-		Person readWilliam = odmManager.read(Person.class, william.getDn());
+		this.odmManager.update(william);
+		Person readWilliam = this.odmManager.read(Person.class, william.getDn());
 		assertEquals(william, readWilliam);
 	}
 
-	private Person[] deleteData = { personTestData[PersonName.JON.getIndex()],
-			personTestData[PersonName.TOM.getIndex()], personTestData[PersonName.DAVROS.getIndex()], };
+	private Person[] deleteData = { this.personTestData[PersonName.JON.getIndex()],
+			this.personTestData[PersonName.TOM.getIndex()], this.personTestData[PersonName.DAVROS.getIndex()], };
 
-	private Person[] whatsLeft = { personTestData[PersonName.WILLIAM.getIndex()],
-			personTestData[PersonName.PATRICK.getIndex()], personTestData[PersonName.PETER.getIndex()],
-			personTestData[PersonName.DALEKS.getIndex()], personTestData[PersonName.MASTER.getIndex()], };
+	private Person[] whatsLeft = { this.personTestData[PersonName.WILLIAM.getIndex()],
+			this.personTestData[PersonName.PATRICK.getIndex()], this.personTestData[PersonName.PETER.getIndex()],
+			this.personTestData[PersonName.DALEKS.getIndex()], this.personTestData[PersonName.MASTER.getIndex()], };
 
 	// Delete a some entries from the the test data set and check what's left is what we'd
 	// expect
 	@Test
 	public void delete() throws Exception {
-		for (Person toDelete : deleteData) {
+		for (Person toDelete : this.deleteData) {
 			LOG.debug(String.format("deleting - %1$s", toDelete.getDn()));
-			odmManager.delete(toDelete);
+			this.odmManager.delete(toDelete);
 		}
 
-		List<Person> allPeople = odmManager.findAll(Person.class, baseName, searchControls);
-		assertEquals(new HashSet<Person>(Arrays.asList(whatsLeft)), new HashSet<Person>(allPeople));
+		List<Person> allPeople = this.odmManager.findAll(Person.class, baseName, this.searchControls);
+		assertEquals(new HashSet<Person>(Arrays.asList(this.whatsLeft)), new HashSet<Person>(allPeople));
 	}
 
 	// Trying to read a non-existant entry should be flagged as an error
 	@Test(expected = NameNotFoundException.class)
 	public void readNonExistant() throws Exception {
-		odmManager.read(Person.class, LdapUtils.newLdapName("cn=Hili Harvey,ou=Doctors,o=Whoniverse"));
+		this.odmManager.read(Person.class, LdapUtils.newLdapName("cn=Hili Harvey,ou=Doctors,o=Whoniverse"));
 	}
 
 	// Read an entry with classes in addition to those supported by the Entry
 	@Test(expected = OdmException.class)
 	public void readNonMatchingObjectclasses() throws Exception {
-		odmManager.read(Person.class, LdapUtils.newLdapName("ou=Doctors,o=Whoniverse"));
+		this.odmManager.read(Person.class, LdapUtils.newLdapName("ou=Doctors,o=Whoniverse"));
 	}
 
 	private final static class NoEntry {
@@ -472,7 +476,7 @@ public final class LdapTests {
 	// Every class to be managed must be annotated @Entry
 	@Test(expected = MetaDataException.class)
 	public void noEntryAnnotation() {
-		((OdmManagerImpl) odmManager).addManagedClass(NoEntry.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(NoEntry.class);
 	}
 
 	@Entry(objectClasses = "test")
@@ -483,7 +487,7 @@ public final class LdapTests {
 	// There must be a field with the @Id annotation
 	@Test(expected = MetaDataException.class)
 	public void noId() {
-		((OdmManagerImpl) odmManager).addManagedClass(NoId.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(NoId.class);
 	}
 
 	@Entry(objectClasses = "test")
@@ -506,7 +510,7 @@ public final class LdapTests {
 	// Only one field may be annotated @Id
 	@Test(expected = MetaDataException.class)
 	public void twoIds() {
-		((OdmManagerImpl) odmManager).addManagedClass(TwoIds.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(TwoIds.class);
 	}
 
 	@Entry(objectClasses = "test")
@@ -524,7 +528,7 @@ public final class LdapTests {
 	// All Entry annotated classes must have a zero argument public constructor
 	@Test(expected = InvalidEntryException.class)
 	public void noConstructor() {
-		((OdmManagerImpl) odmManager).addManagedClass(NoConstructor.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(NoConstructor.class);
 	}
 
 	@Entry(objectClasses = "test")
@@ -540,7 +544,7 @@ public final class LdapTests {
 	// It is illegal put put both the Id and the Attribute annotation on the same field
 	@Test(expected = MetaDataException.class)
 	public void attributeOnId() {
-		((OdmManagerImpl) odmManager).addManagedClass(AttributeOnId.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(AttributeOnId.class);
 	}
 
 	@Entry(objectClasses = "test")
@@ -555,7 +559,7 @@ public final class LdapTests {
 	// The field annotation with @Id must be of type javax.naming.Name
 	@Test(expected = MetaDataException.class)
 	public void idIsNotAName() {
-		((OdmManagerImpl) odmManager).addManagedClass(IdIsNotAName.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(IdIsNotAName.class);
 	}
 
 	@Entry(objectClasses = "test")
@@ -573,7 +577,7 @@ public final class LdapTests {
 	// The OdmManager should flag any missing converters when it is instantiated
 	@Test(expected = InvalidEntryException.class)
 	public void missingConverter() {
-		((OdmManagerImpl) odmManager).addManagedClass(MissingConverter.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(MissingConverter.class);
 	}
 
 	@Entry(objectClasses = "test")
@@ -593,22 +597,22 @@ public final class LdapTests {
 	// type
 	@Test(expected = MetaDataException.class)
 	public void wrongClassForOc() {
-		((OdmManagerImpl) odmManager).addManagedClass(WrongClassForOc.class);
+		((OdmManagerImpl) this.odmManager).addManagedClass(WrongClassForOc.class);
 	}
 
 	// The OdmManager should flag any attempt to use a "unmanaged" class
 	@Test(expected = MetaDataException.class)
 	public void unManagedClass() {
-		odmManager.read(Integer.class, baseName);
+		this.odmManager.read(Integer.class, baseName);
 	}
 
 	@Test
 	public void updateWithChildren_Ldap235() throws Exception {
-		OrganizationalUnit organizationalUnit = odmManager.read(OrganizationalUnit.class, ouTestData[0].getDn());
+		OrganizationalUnit organizationalUnit = this.odmManager.read(OrganizationalUnit.class, ouTestData[0].getDn());
 		organizationalUnit.setStreet("new street");
-		odmManager.update(organizationalUnit);
+		this.odmManager.update(organizationalUnit);
 
-		OrganizationalUnit updated = odmManager.read(OrganizationalUnit.class, organizationalUnit.getDn());
+		OrganizationalUnit updated = this.odmManager.read(OrganizationalUnit.class, organizationalUnit.getDn());
 		assertEquals(organizationalUnit, updated);
 	}
 
@@ -626,16 +630,16 @@ public final class LdapTests {
 		}
 
 		public String getShort() {
-			return shortName;
+			return this.shortName;
 		}
 
 		public String getLong() {
-			return longName;
+			return this.longName;
 		}
 
 		@Override
 		public String toString() {
-			return String.format("short=%1$s, long=%2$s", shortName, longName);
+			return String.format("short=%1$s, long=%2$s", this.shortName, this.longName);
 		}
 
 	}
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java b/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java
index 51355167..bb47d829 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java
@@ -57,21 +57,21 @@ public final class OrganizationalUnit {
 		this.street = street;
 		this.description = description;
 
-		objectClass.add("top");
-		objectClass.add("organizationalUnit");
+		this.objectClass.add("top");
+		this.objectClass.add("organizationalUnit");
 
 		int size = dn.size();
 		if (size > 1) {
-			ou = dn.get(size - 1).split("=")[1];
+			this.ou = dn.get(size - 1).split("=")[1];
 		}
 		else {
-			ou = "";
+			this.ou = "";
 		}
 
 	}
 
 	public Name getDn() {
-		return dn;
+		return this.dn;
 	}
 
 	public void setDn(Name dn) {
@@ -79,15 +79,15 @@ public final class OrganizationalUnit {
 	}
 
 	public List<String> getObjectClasses() {
-		return Collections.unmodifiableList(objectClass);
+		return Collections.unmodifiableList(this.objectClass);
 	}
 
 	public String getOu() {
-		return ou;
+		return this.ou;
 	}
 
 	public String getStreet() {
-		return street;
+		return this.street;
 	}
 
 	public void setStreet(String street) {
@@ -95,24 +95,24 @@ public final class OrganizationalUnit {
 	}
 
 	public String getDescription() {
-		return description;
+		return this.description;
 	}
 
 	@Override
 	public String toString() {
-		return String.format("objectClasses=%1$s | dn=%2$s | ou=%3$s | street=%4$s | description=%5$s", objectClass, dn,
-				ou, street, description);
+		return String.format("objectClasses=%1$s | dn=%2$s | ou=%3$s | street=%4$s | description=%5$s",
+				this.objectClass, this.dn, this.ou, this.street, this.description);
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((description == null) ? 0 : description.hashCode());
-		result = prime * result + ((dn == null) ? 0 : dn.hashCode());
-		result = prime * result + ((objectClass == null) ? 0 : new HashSet<String>(objectClass).hashCode());
-		result = prime * result + ((ou == null) ? 0 : ou.hashCode());
-		result = prime * result + ((street == null) ? 0 : street.hashCode());
+		result = prime * result + ((this.description == null) ? 0 : this.description.hashCode());
+		result = prime * result + ((this.dn == null) ? 0 : this.dn.hashCode());
+		result = prime * result + ((this.objectClass == null) ? 0 : new HashSet<String>(this.objectClass).hashCode());
+		result = prime * result + ((this.ou == null) ? 0 : this.ou.hashCode());
+		result = prime * result + ((this.street == null) ? 0 : this.street.hashCode());
 		return result;
 	}
 
@@ -125,36 +125,36 @@ public final class OrganizationalUnit {
 		if (getClass() != obj.getClass())
 			return false;
 		OrganizationalUnit other = (OrganizationalUnit) obj;
-		if (description == null) {
+		if (this.description == null) {
 			if (other.description != null)
 				return false;
 		}
-		else if (!description.equals(other.description))
+		else if (!this.description.equals(other.description))
 			return false;
-		if (dn == null) {
+		if (this.dn == null) {
 			if (other.dn != null)
 				return false;
 		}
-		else if (!dn.equals(other.dn))
+		else if (!this.dn.equals(other.dn))
 			return false;
-		if (objectClass == null) {
+		if (this.objectClass == null) {
 			if (other.objectClass != null)
 				return false;
 		}
-		else if (objectClass.size() != other.objectClass.size()
-				|| !(new HashSet<String>(objectClass)).equals(new HashSet<String>(other.objectClass)))
+		else if (this.objectClass.size() != other.objectClass.size()
+				|| !(new HashSet<String>(this.objectClass)).equals(new HashSet<String>(other.objectClass)))
 			return false;
-		if (ou == null) {
+		if (this.ou == null) {
 			if (other.ou != null)
 				return false;
 		}
-		else if (!ou.equals(other.ou))
+		else if (!this.ou.equals(other.ou))
 			return false;
-		if (street == null) {
+		if (this.street == null) {
 			if (other.street != null)
 				return false;
 		}
-		else if (!street.equals(other.street))
+		else if (!this.street.equals(other.street))
 			return false;
 		return true;
 	}
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/Person.java b/odm/src/test/java/org/springframework/ldap/odm/test/Person.java
index c2acd4c9..9ac30c38 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/Person.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/Person.java
@@ -42,17 +42,17 @@ public final class Person {
 		this.desc = desc;
 		this.telephoneNumber = telephoneNumber;
 		this.jpegPhoto = jpegPhoto;
-		objectClasses = new ArrayList<String>();
-		objectClasses.add("inetOrgPerson");
-		objectClasses.add("organizationalPerson");
-		objectClasses.add("person");
-		objectClasses.add("top");
+		this.objectClasses = new ArrayList<String>();
+		this.objectClasses.add("inetOrgPerson");
+		this.objectClasses.add("organizationalPerson");
+		this.objectClasses.add("person");
+		this.objectClasses.add("top");
 		int size = dn.size();
 		if (size > 1) {
-			cn = dn.get(size - 1).split("=")[1];
+			this.cn = dn.get(size - 1).split("=")[1];
 		}
 		else {
-			cn = "";
+			this.cn = "";
 		}
 	}
 
@@ -86,7 +86,7 @@ public final class Person {
 	byte[] jpegPhoto;
 
 	public Name getDn() {
-		return dn;
+		return this.dn;
 	}
 
 	public void setDn(Name dn) {
@@ -94,7 +94,7 @@ public final class Person {
 	}
 
 	public String getCn() {
-		return cn;
+		return this.cn;
 	}
 
 	public void setCn(String cn) {
@@ -102,7 +102,7 @@ public final class Person {
 	}
 
 	public String getSurname() {
-		return surname;
+		return this.surname;
 	}
 
 	public void setSurname(String surname) {
@@ -110,7 +110,7 @@ public final class Person {
 	}
 
 	public List<String> getDesc() {
-		return desc;
+		return this.desc;
 	}
 
 	public void setDesc(List<String> desc) {
@@ -118,7 +118,7 @@ public final class Person {
 	}
 
 	public int getTelephoneNumber() {
-		return telephoneNumber;
+		return this.telephoneNumber;
 	}
 
 	public void setTelephoneNumber(int telephoneNumber) {
@@ -126,7 +126,7 @@ public final class Person {
 	}
 
 	public byte[] getJpegPhoto() {
-		return jpegPhoto;
+		return this.jpegPhoto;
 	}
 
 	public void setJpegPhoto(byte[] jpegPhoto) {
@@ -134,36 +134,37 @@ public final class Person {
 	}
 
 	public List<String> getObjectClasses() {
-		return objectClasses;
+		return this.objectClasses;
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder jpegString = new StringBuilder();
-		if (jpegPhoto != null) {
-			for (byte b : jpegPhoto) {
+		if (this.jpegPhoto != null) {
+			for (byte b : this.jpegPhoto) {
 				jpegString.append(Byte.toString(b));
 			}
 		}
 
 		return String.format(
 				"objectClasses=%1$s | dn=%2$s | cn=%3$s | sn=%4$s | desc=%5$s | telephoneNumber=%6$s | jpegPhoto=%7$s",
-				objectClasses, dn, cn, surname, desc, telephoneNumber, jpegString);
+				this.objectClasses, this.dn, this.cn, this.surname, this.desc, this.telephoneNumber, jpegString);
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((cn == null) ? 0 : cn.hashCode());
-		result = prime * result + ((desc == null) ? 0 : new HashSet<String>(desc).hashCode());
-		result = prime * result + ((dn == null) ? 0 : dn.hashCode());
-		result = prime * result + Arrays.hashCode(jpegPhoto);
-		result = prime * result + ((objectClasses == null) ? 0 : new HashSet<String>(objectClasses).hashCode());
-		result = prime * result + ((someRandomField == null) ? 0 : someRandomField.hashCode());
-		result = prime * result + ((someRandomList == null) ? 0 : someRandomList.hashCode());
-		result = prime * result + ((surname == null) ? 0 : surname.hashCode());
-		result = prime * result + telephoneNumber;
+		result = prime * result + ((this.cn == null) ? 0 : this.cn.hashCode());
+		result = prime * result + ((this.desc == null) ? 0 : new HashSet<String>(this.desc).hashCode());
+		result = prime * result + ((this.dn == null) ? 0 : this.dn.hashCode());
+		result = prime * result + Arrays.hashCode(this.jpegPhoto);
+		result = prime * result
+				+ ((this.objectClasses == null) ? 0 : new HashSet<String>(this.objectClasses).hashCode());
+		result = prime * result + ((this.someRandomField == null) ? 0 : this.someRandomField.hashCode());
+		result = prime * result + ((this.someRandomList == null) ? 0 : this.someRandomList.hashCode());
+		result = prime * result + ((this.surname == null) ? 0 : this.surname.hashCode());
+		result = prime * result + this.telephoneNumber;
 		return result;
 	}
 
@@ -176,53 +177,53 @@ public final class Person {
 		if (getClass() != obj.getClass())
 			return false;
 		Person other = (Person) obj;
-		if (cn == null) {
+		if (this.cn == null) {
 			if (other.cn != null)
 				return false;
 		}
-		else if (!cn.equals(other.cn))
+		else if (!this.cn.equals(other.cn))
 			return false;
-		if (desc == null) {
+		if (this.desc == null) {
 			if (other.desc != null)
 				return false;
 		}
-		else if (desc.size() != other.desc.size()
-				|| !(new HashSet<String>(desc)).equals(new HashSet<String>(other.desc)))
+		else if (this.desc.size() != other.desc.size()
+				|| !(new HashSet<String>(this.desc)).equals(new HashSet<String>(other.desc)))
 			return false;
-		if (dn == null) {
+		if (this.dn == null) {
 			if (other.dn != null)
 				return false;
 		}
-		else if (!dn.equals(other.dn))
+		else if (!this.dn.equals(other.dn))
 			return false;
-		if (!Arrays.equals(jpegPhoto, other.jpegPhoto))
+		if (!Arrays.equals(this.jpegPhoto, other.jpegPhoto))
 			return false;
-		if (objectClasses == null) {
+		if (this.objectClasses == null) {
 			if (other.objectClasses != null)
 				return false;
 		}
-		else if (objectClasses.size() != other.objectClasses.size()
-				|| !(new HashSet<String>(objectClasses)).equals(new HashSet<String>(other.objectClasses)))
+		else if (this.objectClasses.size() != other.objectClasses.size()
+				|| !(new HashSet<String>(this.objectClasses)).equals(new HashSet<String>(other.objectClasses)))
 			return false;
-		if (someRandomField == null) {
+		if (this.someRandomField == null) {
 			if (other.someRandomField != null)
 				return false;
 		}
-		else if (!someRandomField.equals(other.someRandomField))
+		else if (!this.someRandomField.equals(other.someRandomField))
 			return false;
-		if (someRandomList == null) {
+		if (this.someRandomList == null) {
 			if (other.someRandomList != null)
 				return false;
 		}
-		else if (!someRandomList.equals(other.someRandomList))
+		else if (!this.someRandomList.equals(other.someRandomList))
 			return false;
-		if (surname == null) {
+		if (this.surname == null) {
 			if (other.surname != null)
 				return false;
 		}
-		else if (!surname.equals(other.surname))
+		else if (!this.surname.equals(other.surname))
 			return false;
-		if (telephoneNumber != other.telephoneNumber)
+		if (this.telephoneNumber != other.telephoneNumber)
 			return false;
 		return true;
 	}
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java b/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java
index a15da814..885e2663 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java
@@ -35,10 +35,10 @@ public final class PlainPerson {
 	public PlainPerson(Name dn, String commonName, String surname) {
 		this.dn = dn;
 		this.surname = surname;
-		objectClasses = new ArrayList<String>();
-		objectClasses.add("top");
-		objectClasses.add("person");
-		cn = commonName;
+		this.objectClasses = new ArrayList<String>();
+		this.objectClasses.add("top");
+		this.objectClasses.add("person");
+		this.cn = commonName;
 	}
 
 	@Attribute(name = "objectClass")
@@ -54,7 +54,7 @@ public final class PlainPerson {
 	private String surname;
 
 	public Name getDn() {
-		return dn;
+		return this.dn;
 	}
 
 	public void setDn(Name dn) {
@@ -62,7 +62,7 @@ public final class PlainPerson {
 	}
 
 	public String getCn() {
-		return cn;
+		return this.cn;
 	}
 
 	public void setCn(String cn) {
@@ -70,7 +70,7 @@ public final class PlainPerson {
 	}
 
 	public String getSurname() {
-		return surname;
+		return this.surname;
 	}
 
 	public void setSurname(String surname) {
@@ -86,13 +86,13 @@ public final class PlainPerson {
 
 		PlainPerson that = (PlainPerson) o;
 
-		if (cn != null ? !cn.equals(that.cn) : that.cn != null)
+		if (this.cn != null ? !this.cn.equals(that.cn) : that.cn != null)
 			return false;
-		if (dn != null ? !dn.equals(that.dn) : that.dn != null)
+		if (this.dn != null ? !this.dn.equals(that.dn) : that.dn != null)
 			return false;
-		if (objectClasses != null ? !objectClasses.equals(that.objectClasses) : that.objectClasses != null)
+		if (this.objectClasses != null ? !this.objectClasses.equals(that.objectClasses) : that.objectClasses != null)
 			return false;
-		if (surname != null ? !surname.equals(that.surname) : that.surname != null)
+		if (this.surname != null ? !this.surname.equals(that.surname) : that.surname != null)
 			return false;
 
 		return true;
@@ -100,10 +100,10 @@ public final class PlainPerson {
 
 	@Override
 	public int hashCode() {
-		int result = objectClasses != null ? objectClasses.hashCode() : 0;
-		result = 31 * result + (dn != null ? dn.hashCode() : 0);
-		result = 31 * result + (cn != null ? cn.hashCode() : 0);
-		result = 31 * result + (surname != null ? surname.hashCode() : 0);
+		int result = this.objectClasses != null ? this.objectClasses.hashCode() : 0;
+		result = 31 * result + (this.dn != null ? this.dn.hashCode() : 0);
+		result = 31 * result + (this.cn != null ? this.cn.hashCode() : 0);
+		result = 31 * result + (this.surname != null ? this.surname.hashCode() : 0);
 		return result;
 	}
 
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
index 3eac2e5a..63a421ef 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java
@@ -85,44 +85,44 @@ public final class SchemaToJavaTests {
 	@Before
 	public void setUp() throws Exception {
 		// Create some basic converters and a converter manager
-		converterManager = new ConverterManagerImpl();
+		this.converterManager = new ConverterManagerImpl();
 
 		Converter ptc = new FromStringConverter();
-		converterManager.addConverter(String.class, "", Byte.class, ptc);
-		converterManager.addConverter(String.class, "", Short.class, ptc);
-		converterManager.addConverter(String.class, "", Integer.class, ptc);
-		converterManager.addConverter(String.class, "", Long.class, ptc);
-		converterManager.addConverter(String.class, "", Double.class, ptc);
-		converterManager.addConverter(String.class, "", Float.class, ptc);
-		converterManager.addConverter(String.class, "", Boolean.class, ptc);
+		this.converterManager.addConverter(String.class, "", Byte.class, ptc);
+		this.converterManager.addConverter(String.class, "", Short.class, ptc);
+		this.converterManager.addConverter(String.class, "", Integer.class, ptc);
+		this.converterManager.addConverter(String.class, "", Long.class, ptc);
+		this.converterManager.addConverter(String.class, "", Double.class, ptc);
+		this.converterManager.addConverter(String.class, "", Float.class, ptc);
+		this.converterManager.addConverter(String.class, "", Boolean.class, ptc);
 
 		Converter tsc = new ToStringConverter();
-		converterManager.addConverter(Byte.class, "", String.class, tsc);
-		converterManager.addConverter(Short.class, "", String.class, tsc);
-		converterManager.addConverter(Integer.class, "", String.class, tsc);
-		converterManager.addConverter(Long.class, "", String.class, tsc);
-		converterManager.addConverter(Double.class, "", String.class, tsc);
-		converterManager.addConverter(Float.class, "", String.class, tsc);
-		converterManager.addConverter(Boolean.class, "", String.class, tsc);
+		this.converterManager.addConverter(Byte.class, "", String.class, tsc);
+		this.converterManager.addConverter(Short.class, "", String.class, tsc);
+		this.converterManager.addConverter(Integer.class, "", String.class, tsc);
+		this.converterManager.addConverter(Long.class, "", String.class, tsc);
+		this.converterManager.addConverter(Double.class, "", String.class, tsc);
+		this.converterManager.addConverter(Float.class, "", String.class, tsc);
+		this.converterManager.addConverter(Boolean.class, "", String.class, tsc);
 
 		// Bind to the directory
-		contextSource = new LdapContextSource();
-		contextSource.setUrl("ldap://127.0.0.1:" + port);
-		contextSource.setUserDn("");
-		contextSource.setPassword("");
-		contextSource.setPooled(false);
-		contextSource.afterPropertiesSet();
+		this.contextSource = new LdapContextSource();
+		this.contextSource.setUrl("ldap://127.0.0.1:" + port);
+		this.contextSource.setUserDn("");
+		this.contextSource.setPassword("");
+		this.contextSource.setPooled(false);
+		this.contextSource.afterPropertiesSet();
 
 		// Clear out any old data - and load the test data
-		LdapTestUtils.cleanAndSetup(contextSource, baseName, new ClassPathResource("testdata.ldif"));
+		LdapTestUtils.cleanAndSetup(this.contextSource, baseName, new ClassPathResource("testdata.ldif"));
 	}
 
 	@After
 	public void tearDown() throws Exception {
 		LdapTestUtils.shutdownEmbeddedServer();
 
-		contextSource = null;
-		converterManager = null;
+		this.contextSource = null;
+		this.converterManager = null;
 	}
 
 	// Figure out the path of the created Java file
@@ -181,7 +181,7 @@ public final class SchemaToJavaTests {
 		Class<?> clazz = ucl.loadClass(packageName + "." + className);
 
 		// Create our OdmManager using our new class
-		OdmManagerImpl odmManager = new OdmManagerImpl(converterManager, contextSource);
+		OdmManagerImpl odmManager = new OdmManagerImpl(this.converterManager, this.contextSource);
 		odmManager.addManagedClass(clazz);
 
 		// And try reading from the directory using it