diff --git a/src/test/java/j8583/CustomBinCodecs.java b/src/test/java/j8583/CustomBinCodecs.java
index c46f3cc..be5e2ef 100644
--- a/src/test/java/j8583/CustomBinCodecs.java
+++ b/src/test/java/j8583/CustomBinCodecs.java
@@ -87,7 +87,7 @@ public class CustomBinCodecs {
         }
         //Test parsing
         tmpl = mfact.parseMessage(buf, 0);
-        Assert.assertEquals(new Long(1234567890l), tmpl.getObjectValue(2));
+        Assert.assertEquals(1234567890l, tmpl.getObjectValue(2));
         Assert.assertEquals(b29, tmpl.getObjectValue(3));
     }
 
diff --git a/src/test/java/j8583/TestDates.java b/src/test/java/j8583/TestDates.java
index 335baef..399274d 100644
--- a/src/test/java/j8583/TestDates.java
+++ b/src/test/java/j8583/TestDates.java
@@ -6,12 +6,10 @@ import java.text.ParseException;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import com.solab.iso8583.IsoMessage;
 import org.junit.*;
 
 import com.solab.iso8583.IsoType;
 import com.solab.iso8583.IsoValue;
-import com.solab.iso8583.MessageFactory;
 import com.solab.iso8583.parse.Date10ParseInfo;
 import com.solab.iso8583.parse.Date4ParseInfo;
 
@@ -21,16 +19,6 @@ import com.solab.iso8583.parse.Date4ParseInfo;
  */
 public class TestDates {
 
-	private MessageFactory<IsoMessage> mf;
-
-	@Before
-	public void init() throws IOException {
-		mf = new MessageFactory<IsoMessage>();
-		mf.setCharacterEncoding("UTF-8");
-		mf.setCustomField(48, new CustomField48());
-		mf.setConfigPath("config.xml");
-	}
-
 	@Test
 	public void testDate4FutureTolerance() throws ParseException, IOException {
 		GregorianCalendar today = new GregorianCalendar();