diff --git a/dusken/main/tests/__init__.py b/dusken/main/tests/__init__.py
index b2b74d2..c91c9dc 100644
--- a/dusken/main/tests/__init__.py
+++ b/dusken/main/tests/__init__.py
@@ -1 +1,4 @@
 from member import *
+from membership import *
+from group import *
+from groupmembership import *
diff --git a/dusken/main/tests/group.py b/dusken/main/tests/group.py
index 1a82776..dd04d91 100644
--- a/dusken/main/tests/group.py
+++ b/dusken/main/tests/group.py
@@ -24,24 +24,24 @@ class GroupTest(ResourceTestCase):
 		self.assertNotEquals(None,member['resource_uri'])
 
 	def setUp(self):
-		super(Group, self).setUp()
+		super(GroupTest, self).setUp()
 
 		# URI to get all groups
-		self.all_groups_url = '/api/v1/group/'
+		self.groups_url = '/api/v1/group/'
 
 	def test_request_types(self):
 		"""
 		Tests that the endpoint responds to correct types of requests.
 		"""
-		resp = self.api_client.get(self.all_groups_url, format='json')
+		resp = self.api_client.get(self.groups_url, format='json')
 		self.assertNotEquals(resp.status_code, 405)
 
-		resp = self.api_client.post(self.all_groups_url)
+		resp = self.api_client.post(self.groups_url)
 		self.assertNotEquals(resp.status_code, 405)
 
-		resp = self.api_client.put(self.all_groups_url)
+		resp = self.api_client.put(self.groups_url)
 		self.assertHttpMethodNotAllowed(resp)
 
-		resp = self.api_client.delete(self.all_groups_url)
+		resp = self.api_client.delete(self.groups_url)
 		self.assertHttpMethodNotAllowed(resp)
 
diff --git a/dusken/main/tests/groupmembership.py b/dusken/main/tests/groupmembership.py
new file mode 100644
index 0000000..0236930
--- /dev/null
+++ b/dusken/main/tests/groupmembership.py
@@ -0,0 +1,47 @@
+import logging
+
+from support.test import ResourceTestCase
+from main.models import GroupMembership
+
+class GroupMembershipTest(ResourceTestCase):
+	fixtures = [ 'testdata.json' ]
+
+	def assertValidGroupgroupmembershipshipData(self, groupmembership):
+		self.assertEquals(type(groupmembership), dict)	
+		self.assertKeys(groupmembership, [ 
+			u'id',
+			u'groupmembership',
+			u'group',
+			u'created',
+			u'updated',
+			u'resource_uri' 
+		])
+		self.assertNotEquals(None,groupmembership['id'])
+		self.assertNotEquals(None,groupmembership['groupmembership'])
+		self.assertNotEquals(None,groupmembership['group'])
+		self.assertNotEquals(None,groupmembership['created'])
+		self.assertNotEquals(None,groupmembership['updated'])
+		self.assertNotEquals(None,groupmembership['resource_uri'])
+
+	def setUp(self):
+		super(GroupMembershipTest, self).setUp()
+
+		# URI to get all groups
+		self.groupmembership_url = '/api/v1/groupmembership/'
+
+	def test_request_types(self):
+		"""
+		Tests that the endpoint responds to correct types of requests.
+		"""
+		resp = self.api_client.get(self.groupmembership_url, format='json')
+		self.assertNotEquals(resp.status_code, 405)
+
+		resp = self.api_client.post(self.groupmembership_url)
+		self.assertNotEquals(resp.status_code, 405)
+
+		resp = self.api_client.put(self.groupmembership_url)
+		self.assertNotEquals(resp.status_code, 405)
+
+		resp = self.api_client.delete(self.groupmembership_url)
+		self.assertNotEquals(resp.status_code, 405)
+
diff --git a/dusken/main/tests/membership.py b/dusken/main/tests/membership.py
index 63c43ee..a9ab578 100644
--- a/dusken/main/tests/membership.py
+++ b/dusken/main/tests/membership.py
@@ -8,9 +8,10 @@ class MembershipTest(ResourceTestCase):
 
     def assertValidMembershipData(self, membership):
         self.assertEquals(type(membership), dict)
-        self.assertKeys(member, [ 
+        self.assertKeys(membership, [ 
             u'id', 
 			u'start_date',
+			u'expires',
 			u'mtype',
 			u'payment',
 			u'member',
@@ -18,47 +19,48 @@ class MembershipTest(ResourceTestCase):
             u'updated',
             u'resource_uri' 
             ])
-        self.assertNotEquals(None,member['id'])
-        self.assertNotEquals(None,member['start_type'])
-        self.assertNotEquals(None,member['mtype'])
-        self.assertNotEquals(None,member['member'])
-        self.assertNotEquals(None,member['created'])
-        self.assertNotEquals(None,member['updated'])
-        self.assertNotEquals(None,member['resource_uri'])
+        self.assertNotEquals(None,membership['id'])
+        self.assertNotEquals(None,membership['start_type'])
+        self.assertNotEquals(None,membership['expires'])
+        self.assertNotEquals(None,membership['mtype'])
+        self.assertNotEquals(None,membership['membership'])
+        self.assertNotEquals(None,membership['created'])
+        self.assertNotEquals(None,membership['updated'])
+        self.assertNotEquals(None,membership['resource_uri'])
 
     def setUp(self):
         super(MembershipTest, self).setUp()
 
         # URI to get the existing member. We'll probably 
         # need it at one point or another.
-        self.all_membership_url = '/api/v1/membership/'
+        self.membership_url = '/api/v1/membership/'
 
 
     def test_check_request_types(self):
         """
         Tests that the endpoint responds to correct types of requests.
         """
-        resp = self.api_client.get(self.all_members_url, format='json')
+        resp = self.api_client.get(self.membership_url, format='json')
         self.assertNotEquals(resp.status_code, 405)
 
-        resp = self.api_client.post(self.all_members_url)
+        resp = self.api_client.post(self.membership_url)
         self.assertNotEquals(resp.status_code, 405)
 
-        resp = self.api_client.put(self.all_members_url)
+        resp = self.api_client.put(self.membership_url)
         self.assertHttpMethodNotAllowed(resp)
 
-        resp = self.api_client.delete(self.all_members_url)
+        resp = self.api_client.delete(self.membership_url)
         self.assertHttpMethodNotAllowed(resp)
 
     def test_get_memberships(self):
         """
         Tests that we can get a premade user correctly.
         """
-        resp = self.api_client.get(self.membership_url, format='json')
+        resp = self.api_client.get(self.membership_url +'1/', format='json')
         self.assertValidJSONResponse(resp)
 
         # Check if the returned data is correct:
-        member = self.deserialize(resp)
-        self.assertValidMembershipData(member)
+        membership = self.deserialize(resp)
+        self.assertValidMembershipData(membership)