diff --git a/src/test/java/j8583/CustomField48.java b/src/test/java/com/solab/iso8583/CustomField48.java
similarity index 97%
rename from src/test/java/j8583/CustomField48.java
rename to src/test/java/com/solab/iso8583/CustomField48.java
index 72bf819..f8cd8e7 100644
--- a/src/test/java/j8583/CustomField48.java
+++ b/src/test/java/com/solab/iso8583/CustomField48.java
@@ -1,6 +1,4 @@
-package j8583;
-
-import com.solab.iso8583.CustomField;
+package com.solab.iso8583;
 
 /** This is an example of a custom field codec, which converts between strings and instances of this same class.
  * It's used to test the encoding and decoding of custom fields by the message factory.
diff --git a/src/test/java/j8583/TestBinaries.java b/src/test/java/com/solab/iso8583/TestBinaries.java
similarity index 97%
rename from src/test/java/j8583/TestBinaries.java
rename to src/test/java/com/solab/iso8583/TestBinaries.java
index 03c83fa..8a7098b 100644
--- a/src/test/java/j8583/TestBinaries.java
+++ b/src/test/java/com/solab/iso8583/TestBinaries.java
@@ -1,17 +1,14 @@
-package j8583;
+package com.solab.iso8583;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 
-import com.solab.iso8583.IsoType;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.solab.iso8583.IsoMessage;
-import com.solab.iso8583.MessageFactory;
 import com.solab.iso8583.util.HexCodec;
 
 /** Test binary message encoding and binary fields. */
diff --git a/src/test/java/j8583/TestConfigParser.java b/src/test/java/com/solab/iso8583/TestConfigParser.java
similarity index 92%
rename from src/test/java/j8583/TestConfigParser.java
rename to src/test/java/com/solab/iso8583/TestConfigParser.java
index 935148a..e2c1597 100644
--- a/src/test/java/j8583/TestConfigParser.java
+++ b/src/test/java/com/solab/iso8583/TestConfigParser.java
@@ -1,9 +1,5 @@
-package j8583;
+package com.solab.iso8583;
 
-import com.solab.iso8583.IsoMessage;
-import com.solab.iso8583.IsoType;
-import com.solab.iso8583.IsoValue;
-import com.solab.iso8583.MessageFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/j8583/TestEbcdic.java b/src/test/java/com/solab/iso8583/TestEbcdic.java
similarity index 98%
rename from src/test/java/j8583/TestEbcdic.java
rename to src/test/java/com/solab/iso8583/TestEbcdic.java
index 637323b..9ed9beb 100644
--- a/src/test/java/j8583/TestEbcdic.java
+++ b/src/test/java/com/solab/iso8583/TestEbcdic.java
@@ -1,9 +1,5 @@
-package j8583;
+package com.solab.iso8583;
 
-import com.solab.iso8583.IsoMessage;
-import com.solab.iso8583.IsoType;
-import com.solab.iso8583.IsoValue;
-import com.solab.iso8583.MessageFactory;
 import com.solab.iso8583.parse.*;
 import com.solab.iso8583.util.HexCodec;
 import org.junit.Assert;
diff --git a/src/test/java/j8583/TestFormats.java b/src/test/java/com/solab/iso8583/TestFormats.java
similarity index 97%
rename from src/test/java/j8583/TestFormats.java
rename to src/test/java/com/solab/iso8583/TestFormats.java
index dca5df9..9e2fad9 100644
--- a/src/test/java/j8583/TestFormats.java
+++ b/src/test/java/com/solab/iso8583/TestFormats.java
@@ -1,4 +1,4 @@
-package j8583;
+package com.solab.iso8583;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -7,8 +7,6 @@ import java.util.TimeZone;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.solab.iso8583.IsoType;
-
 /** Tests formatting of certain IsoTypes.
  * 
  * @author Enrique Zamudio
diff --git a/src/test/java/j8583/TestIsoMessage.java b/src/test/java/com/solab/iso8583/TestIsoMessage.java
similarity index 96%
rename from src/test/java/j8583/TestIsoMessage.java
rename to src/test/java/com/solab/iso8583/TestIsoMessage.java
index 6e5b798..482af0a 100644
--- a/src/test/java/j8583/TestIsoMessage.java
+++ b/src/test/java/com/solab/iso8583/TestIsoMessage.java
@@ -1,18 +1,13 @@
-package j8583;
+package com.solab.iso8583;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
 
-import com.solab.iso8583.IsoValue;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.solab.iso8583.IsoMessage;
-import com.solab.iso8583.IsoType;
-import com.solab.iso8583.MessageFactory;
-
 /** These are very simple tests for creating and manipulating messages.
  * 
  * @author Enrique Zamudio
diff --git a/src/test/java/j8583/TestIssue4.java b/src/test/java/com/solab/iso8583/TestIssue4.java
similarity index 96%
rename from src/test/java/j8583/TestIssue4.java
rename to src/test/java/com/solab/iso8583/TestIssue4.java
index b7f96d0..eff1f89 100644
--- a/src/test/java/j8583/TestIssue4.java
+++ b/src/test/java/com/solab/iso8583/TestIssue4.java
@@ -1,7 +1,5 @@
-package j8583;
+package com.solab.iso8583;
 
-import com.solab.iso8583.IsoMessage;
-import com.solab.iso8583.MessageFactory;
 import com.solab.iso8583.parse.ConfigParser;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/j8583/TestParsing.java b/src/test/java/com/solab/iso8583/TestParsing.java
similarity index 98%
rename from src/test/java/j8583/TestParsing.java
rename to src/test/java/com/solab/iso8583/TestParsing.java
index bc383b6..71d5375 100644
--- a/src/test/java/j8583/TestParsing.java
+++ b/src/test/java/com/solab/iso8583/TestParsing.java
@@ -1,4 +1,4 @@
-package j8583;
+package com.solab.iso8583;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -8,16 +8,12 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import com.solab.iso8583.IsoMessage;
-import com.solab.iso8583.IsoValue;
 import com.solab.iso8583.codecs.CompositeField;
 import com.solab.iso8583.parse.NumericParseInfo;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.solab.iso8583.MessageFactory;
-
 /** Test that parsing invalid messages is properly handled.
  * 
  * @author Enrique Zamudio
diff --git a/src/test/java/j8583/CustomBinCodecs.java b/src/test/java/com/solab/iso8583/parse/CustomBinCodecs.java
similarity index 96%
rename from src/test/java/j8583/CustomBinCodecs.java
rename to src/test/java/com/solab/iso8583/parse/CustomBinCodecs.java
index be5e2ef..f78ec1e 100644
--- a/src/test/java/j8583/CustomBinCodecs.java
+++ b/src/test/java/com/solab/iso8583/parse/CustomBinCodecs.java
@@ -1,13 +1,10 @@
-package j8583;
+package com.solab.iso8583.parse;
 
 import com.solab.iso8583.IsoType;
 import com.solab.iso8583.MessageFactory;
 import com.solab.iso8583.IsoMessage;
 import com.solab.iso8583.codecs.BigIntBcdCodec;
 import com.solab.iso8583.codecs.LongBcdCodec;
-import com.solab.iso8583.parse.FieldParseInfo;
-import com.solab.iso8583.parse.LlbinParseInfo;
-import com.solab.iso8583.parse.LllbinParseInfo;
 import com.solab.iso8583.util.HexCodec;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/j8583/TestComposites.java b/src/test/java/com/solab/iso8583/parse/TestComposites.java
similarity index 95%
rename from src/test/java/j8583/TestComposites.java
rename to src/test/java/com/solab/iso8583/parse/TestComposites.java
index 345f5dc..ca7a20b 100644
--- a/src/test/java/j8583/TestComposites.java
+++ b/src/test/java/com/solab/iso8583/parse/TestComposites.java
@@ -1,11 +1,8 @@
-package j8583;
+package com.solab.iso8583.parse;
 
 import com.solab.iso8583.IsoType;
 import com.solab.iso8583.IsoValue;
 import com.solab.iso8583.codecs.CompositeField;
-import com.solab.iso8583.parse.AlphaParseInfo;
-import com.solab.iso8583.parse.LlvarParseInfo;
-import com.solab.iso8583.parse.NumericParseInfo;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/j8583/TestDates.java b/src/test/java/com/solab/iso8583/parse/TestDates.java
similarity index 94%
rename from src/test/java/j8583/TestDates.java
rename to src/test/java/com/solab/iso8583/parse/TestDates.java
index e8febf9..c10bbda 100644
--- a/src/test/java/j8583/TestDates.java
+++ b/src/test/java/com/solab/iso8583/parse/TestDates.java
@@ -1,4 +1,4 @@
-package j8583;
+package com.solab.iso8583.parse;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -10,8 +10,6 @@ import org.junit.*;
 
 import com.solab.iso8583.IsoType;
 import com.solab.iso8583.IsoValue;
-import com.solab.iso8583.parse.Date10ParseInfo;
-import com.solab.iso8583.parse.Date4ParseInfo;
 
 /** Test that the dates are formatted and parsed correctly.
  * 
diff --git a/src/test/java/j8583/TestBcd.java b/src/test/java/com/solab/iso8583/util/TestBcd.java
similarity index 97%
rename from src/test/java/j8583/TestBcd.java
rename to src/test/java/com/solab/iso8583/util/TestBcd.java
index 6ec9677..9e17a70 100644
--- a/src/test/java/j8583/TestBcd.java
+++ b/src/test/java/com/solab/iso8583/util/TestBcd.java
@@ -1,6 +1,5 @@
-package j8583;
+package com.solab.iso8583.util;
 
-import com.solab.iso8583.util.Bcd;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/j8583/TestHexCodec.java b/src/test/java/com/solab/iso8583/util/TestHexCodec.java
similarity index 95%
rename from src/test/java/j8583/TestHexCodec.java
rename to src/test/java/com/solab/iso8583/util/TestHexCodec.java
index 592fc42..2acb2a0 100644
--- a/src/test/java/j8583/TestHexCodec.java
+++ b/src/test/java/com/solab/iso8583/util/TestHexCodec.java
@@ -1,11 +1,8 @@
-package j8583;
+package com.solab.iso8583.util;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.solab.iso8583.util.HexCodec;
-
-
 public class TestHexCodec {
 
 	public void encodeDecode(String hex) {