diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
index f5d2c9964..596fd9026 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
@@ -31,6 +31,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import org.bson.types.ObjectId;
 import org.joda.time.LocalDate;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,6 +44,7 @@ import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.PersonPojoStringId;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
@@ -379,6 +381,22 @@ public class MappingMongoConverterUnitTests {
 		converter.read(Person.class, dbObject);
 	}
 	
+	@Test
+	public void convertsObjectIdStringsToObjectIdCorrectly() {
+		PersonPojoStringId p1 = new PersonPojoStringId("1234567890", "Text-1");
+		DBObject dbo1 = new BasicDBObject();
+		
+		converter.write(p1, dbo1);
+		assertThat(dbo1.get("_id"), is(String.class));
+		
+		PersonPojoStringId p2 = new PersonPojoStringId(new ObjectId().toString(), "Text-1");
+		DBObject dbo2 = new BasicDBObject();
+		
+		converter.write(p2, dbo2);
+		assertThat(dbo2.get("_id"), is(ObjectId.class));
+	}
+	
+	
 	class ClassWithEnumProperty {
 		
 		SampleEnum sampleEnum;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
index 27155c021..751469fb3 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
@@ -35,7 +34,6 @@ import com.mongodb.Mongo;
 import com.mongodb.MongoException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.bson.types.ObjectId;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
@@ -45,7 +43,6 @@ import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoDbUtils;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.SimpleMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Order;
@@ -164,7 +161,7 @@ public class MappingTests {
 	}
 
 	@Test
-	@SuppressWarnings({"unchecked"})
+	@SuppressWarnings({"unchecked", "rawtypes"})
 	public void testWriteEntity() {
 
 		Address addr = new Address();
@@ -199,8 +196,8 @@ public class MappingTests {
 		assertThat(result.get(0).getAccounts(), notNullValue());
 	}
 
-	@SuppressWarnings({"unchecked"})
 	@Test
+	@SuppressWarnings({"unchecked", "rawtypes"})
 	public void testUniqueIndex() {
 		Address addr = new Address();
 		addr.setLines(new String[]{"1234 W. 1st Street", "Apt. 12"});
@@ -334,8 +331,8 @@ public class MappingTests {
 		assertNotNull(p.getId());
 	}
 
-	@SuppressWarnings({"unchecked"})
 	@Test
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void testQueryUpdate() {
 		Address addr = new Address();
 		addr.setLines(new String[]{"1234 W. 1st Street", "Apt. 12"});
@@ -447,19 +444,6 @@ public class MappingTests {
 
 	}
 
-	@Test
-	//TODO: this needs fixing!
-	public void testStringToObjectIdConversion() {
-		PersonPojoStringId p1 = new PersonPojoStringId("1234567890", "Text-1");
-		DBObject dbo1 = new BasicDBObject();
-		this.template.getConverter().write(p1, dbo1);
-		assertThat(dbo1.get("_id"), is(String.class));
-		PersonPojoStringId p2 = new PersonPojoStringId(new ObjectId().toString(), "Text-1");
-		DBObject dbo2 = new BasicDBObject();
-		this.template.getConverter().write(p2, dbo2);
-		assertThat(dbo2.get("_id"), is(ObjectId.class));
-	}
-
 	@Test
 	public void testPersonWithLongDBRef() {
 		PersonPojoLongId personPojoLongId = new PersonPojoLongId(12L, "PersonWithLongDBRef");