diff --git a/src/jieqoo/android/KASS/test/models/AccountTests.java b/src/jieqoo/android/KASS/models/test/AccountTests.java
similarity index 93%
rename from src/jieqoo/android/KASS/test/models/AccountTests.java
rename to src/jieqoo/android/KASS/models/test/AccountTests.java
index 37e2a21..8c99f4c 100644
--- a/src/jieqoo/android/KASS/test/models/AccountTests.java
+++ b/src/jieqoo/android/KASS/models/test/AccountTests.java
@@ -1,12 +1,12 @@
 /**
  * 
  */
-package jieqoo.android.KASS.test.models;
+package jieqoo.android.KASS.models.test;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import jieqoo.android.models.Account;
+import jieqoo.android.KASS.models.Account;
 import junit.framework.TestCase;
 
 /**
diff --git a/src/jieqoo/android/KASS/models/test/ListingTests.java b/src/jieqoo/android/KASS/models/test/ListingTests.java
new file mode 100644
index 0000000..a2f9474
--- /dev/null
+++ b/src/jieqoo/android/KASS/models/test/ListingTests.java
@@ -0,0 +1,20 @@
+package jieqoo.android.KASS.models.test;
+
+import java.text.ParseException;
+
+import jieqoo.android.KASS.models.Listing;
+import jieqoo.android.KASS.test.Fixtures;
+import junit.framework.TestCase;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class ListingTests extends TestCase {
+
+	public final void testCreateFromJSONObject() throws JSONException, ParseException {
+		JSONObject object = new JSONObject(Fixtures.LISTING);
+		Listing listing = new Listing(object);
+		assertEquals(listing.getId(), "4f6053a8cf60210e50000002");
+	}
+	
+}
diff --git a/src/jieqoo/android/KASS/test/models/ListingsTests.java b/src/jieqoo/android/KASS/models/test/ListingsTests.java
similarity index 89%
rename from src/jieqoo/android/KASS/test/models/ListingsTests.java
rename to src/jieqoo/android/KASS/models/test/ListingsTests.java
index 7d9b52f..6d61654 100644
--- a/src/jieqoo/android/KASS/test/models/ListingsTests.java
+++ b/src/jieqoo/android/KASS/models/test/ListingsTests.java
@@ -1,9 +1,9 @@
-package jieqoo.android.KASS.test.models;
+package jieqoo.android.KASS.models.test;
 
 import java.text.ParseException;
 
+import jieqoo.android.KASS.models.Listings;
 import jieqoo.android.KASS.test.Fixtures;
-import jieqoo.android.models.Listings;
 import junit.framework.TestCase;
 
 import org.json.JSONException;
diff --git a/src/jieqoo/android/KASS/test/tasks/AccountCreateTaskTests.java b/src/jieqoo/android/KASS/tasks/test/AccountCreateTaskTests.java
similarity index 85%
rename from src/jieqoo/android/KASS/test/tasks/AccountCreateTaskTests.java
rename to src/jieqoo/android/KASS/tasks/test/AccountCreateTaskTests.java
index 0eb33db..b1e1787 100644
--- a/src/jieqoo/android/KASS/test/tasks/AccountCreateTaskTests.java
+++ b/src/jieqoo/android/KASS/tasks/test/AccountCreateTaskTests.java
@@ -1,8 +1,8 @@
-package jieqoo.android.KASS.test.tasks;
+package jieqoo.android.KASS.tasks.test;
 
-import jieqoo.android.models.Account;
-import jieqoo.android.models.RESTListener;
-import jieqoo.android.tasks.AccountCreateTask;
+import jieqoo.android.KASS.models.Account;
+import jieqoo.android.KASS.models.RESTListener;
+import jieqoo.android.KASS.tasks.AccountCreateTask;
 import junit.framework.TestCase;
 
 import org.json.JSONException;
diff --git a/src/jieqoo/android/KASS/test/tasks/FetchRESTResponseTaskTests.java b/src/jieqoo/android/KASS/tasks/test/FetchRESTResponseTaskTests.java
similarity index 89%
rename from src/jieqoo/android/KASS/test/tasks/FetchRESTResponseTaskTests.java
rename to src/jieqoo/android/KASS/tasks/test/FetchRESTResponseTaskTests.java
index 4068978..7932633 100644
--- a/src/jieqoo/android/KASS/test/tasks/FetchRESTResponseTaskTests.java
+++ b/src/jieqoo/android/KASS/tasks/test/FetchRESTResponseTaskTests.java
@@ -1,12 +1,12 @@
-package jieqoo.android.KASS.test.tasks;
+package jieqoo.android.KASS.tasks.test;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import jieqoo.android.models.RESTListener;
-import jieqoo.android.models.RESTResponse;
-import jieqoo.android.tasks.FetchRESTResponseTask;
-import jieqoo.android.util.Configuration;
+import jieqoo.android.KASS.models.RESTListener;
+import jieqoo.android.KASS.models.RESTResponse;
+import jieqoo.android.KASS.tasks.FetchRESTResponseTask;
+import jieqoo.android.KASS.util.Configuration;
 import android.test.InstrumentationTestCase;
 import android.util.Log;