diff --git a/test/data.py b/test/data.py
new file mode 100755
index 000000000..d7c19af5f
--- /dev/null
+++ b/test/data.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+account1 = u'acc1'
+account2 = u'Cool"chârßéµö'
+
+contacts = {}
+contacts[account1] = {
+	u'default1@gajim.org': {
+			  'ask': None, 'groups': [], 'name': None, 'resources': {}, 
+			  'subscription': u'both'},
+	u'default2@gajim.org': {
+			  'ask': None, 'groups': [u'GroupA',], 'name': None, 'resources': {}, 
+			  'subscription': u'both'},
+	u'Cool"chârßéµö@gajim.org': {
+			  'ask': None, 'groups': [u'<Cool"chârßéµö', u'GroupB'],
+			  'name': None, 'resources': {}, 'subscription': u'both'},
+	u'samejid@gajim.org': {
+			  'ask': None, 'groups': [u'GroupA',], 'name': None, 'resources': {},
+			  'subscription': u'both'}
+}
+contacts[account2] = {
+	u'default3@gajim.org': {
+			  'ask': None, 'groups': [u'GroupC',], 'name': None, 'resources': {}, 
+			  'subscription': u'both'},
+	u'asksubfrom@gajim.org': {
+			  'ask': u'subscribe', 'groups': [u'GroupA',], 'name': None,
+			  'resources': {}, 'subscription': u'from'},
+	u'subto@gajim.org': {
+			  'ask': None, 'groups': [u'GroupB'], 'name': None, 'resources': {}, 
+			  'subscription': u'to'},
+	u'samejid@gajim.org': {
+			  'ask': None, 'groups': [u'GroupA', u'GroupB'], 'name': None, 
+			  'resources': {}, 'subscription': u'both'}
+}
+
+# vim: se ts=3:
diff --git a/test/mocks.py b/test/mocks.py
index a04ec3a2d..f644954f1 100644
--- a/test/mocks.py
+++ b/test/mocks.py
@@ -4,10 +4,34 @@ from mock import Mock
 from common import gajim
 
 class MockConnection(Mock):
-	def __init__(self, name, *args):
+	def __init__(self, account, *args):
 		Mock.__init__(self, *args)
-		self.name = name
-		gajim.connections[name] = self
+		self.name = account
+		self.connected = 2
+		self.mood = {}
+		self.activity = {}
+		self.tune = {}
+		self.blocked_contacts = {}
+		self.blocked_groups = {}
+		gajim.interface.instances[account] = {'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}}
+		gajim.interface.minimized_controls[account] = {}
+		gajim.contacts.add_account(account)
+		gajim.groups[account] = {}
+		gajim.gc_connected[account] = {}
+		gajim.automatic_rooms[account] = {}
+		gajim.newly_added[account] = []
+		gajim.to_be_removed[account] = []
+		gajim.nicks[account] = gajim.config.get_per('accounts', account, 'name')
+		gajim.block_signed_in_notifications[account] = True
+		gajim.sleeper_state[account] = 0
+		gajim.encrypted_chats[account] = []
+		gajim.last_message_time[account] = {}
+		gajim.status_before_autoaway[account] = ''
+		gajim.transport_avatar[account] = {}
+		gajim.gajim_optional_features[account] = []
+		gajim.caps_hash[account] = ''
+
+		gajim.connections[account] = self
 
 class MockWindow(Mock):
 	def __init__(self, *args):
@@ -31,13 +55,17 @@ class MockChatControl(Mock):
 		return self is other
 
 class MockInterface(Mock):
-	def __init__(self, acct, *args):
+	def __init__(self, *args):
 		Mock.__init__(self, *args)
 		self.msg_win_mgr = Mock()
 		self.roster = Mock()
 
 		self.remote_ctrl = None
-		self.minimized_controls = { acct: {} }
+		self.instances = {}
+		self.minimized_controls = {}
+		self.status_sent_to_users = Mock()
+
+		self.jabber_state_images = {'16': Mock(), '32': Mock(), 'opened': Mock(), 'closed': Mock()}
 
 class MockLogger(Mock):
 	def __init__(self):
@@ -67,4 +95,4 @@ class MockSession(Mock):
 	def __nonzero__(self):
 		return True
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/test/test_misc_interface.py b/test/test_misc_interface.py
index 32e74aa25..860e89cd4 100644
--- a/test/test_misc_interface.py
+++ b/test/test_misc_interface.py
@@ -18,6 +18,7 @@ gajim.logger = Mock()
 Interface()
 
 class TestMiscInterface(unittest.TestCase):
+
 	def test_links_regexp_entire(self):
 		def assert_matches_all(str):
 			m = gajim.interface.basic_pattern_re.match(str)
@@ -46,4 +47,4 @@ class TestMiscInterface(unittest.TestCase):
 if __name__ == '__main__':
 	unittest.main()
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff --git a/test/test_roster.py b/test/test_roster.py
new file mode 100755
index 000000000..0ad390b10
--- /dev/null
+++ b/test/test_roster.py
@@ -0,0 +1,171 @@
+import unittest
+
+import time
+
+import testlib
+testlib.setup_env()
+
+from data import *
+
+from mock import Mock, expectParams
+from mocks import *
+
+from common import gajim
+from common import zeroconf
+import roster_window
+
+gajim.get_jid_from_account = lambda acc: 'myjid@' + acc
+
+class TestRosterWindow(unittest.TestCase):
+
+	def setUp(self):
+		gajim.interface = MockInterface()
+		self.roster = roster_window.RosterWindow()
+		
+		# Please unuglify :-)
+		self.C_NAME = roster_window.C_NAME
+		self.C_TYPE = roster_window.C_TYPE
+		self.C_JID = roster_window.C_JID
+		self.C_ACCOUNT = roster_window.C_ACCOUNT
+
+		# Add after creating the window
+		# We want to test the filling explicitly
+		for acc in contacts:
+			gajim.connections[acc] = MockConnection(acc)
+
+	def tearDown(self):
+		self.roster.model.clear()
+		for acc in contacts:
+			gajim.contacts.clear_contacts(acc)
+
+	# Custom assertions
+	def assert_all_contacts_are_in_roster(self, acc):
+		for jid in contacts[acc]:
+			self.assert_contact_is_in_roster(jid, acc)
+
+	def assert_contact_is_in_roster(self, jid, account):
+		contacts = gajim.contacts.get_contacts(account, jid)
+		# check for all resources
+		for contact in contacts:
+			iters = self.roster._get_contact_iter(
+				jid, account, model=self.roster.model)
+			self.assertTrue(len(iters) == len(contact.get_shown_groups()),
+				msg='Contact is not in all his groups')
+
+			# check for each group tag	
+			for titerC in iters:
+				self.assertTrue(self.roster.model.iter_is_valid(titerC),
+					msg='Contact iter invalid')
+
+				c_model = self.roster.model[titerC]
+				self.assertEquals(contact.get_shown_name(), c_model[self.C_NAME],
+					msg='Contact name missmatch')
+				self.assertEquals(contact.jid, c_model[self.C_JID],
+					msg='Jid missmatch')
+
+				if not self.roster.regroup:
+					self.assertEquals(account, c_model[self.C_ACCOUNT],
+						msg='Account missmatch')
+				# TODO: Is our parent correct? (group or big b)
+				
+	def assert_group_is_in_roster(self, group, account):
+		#TODO
+		pass
+
+	def assert_account_is_in_roster(self, acc):
+		titerA = self.roster._get_account_iter(acc, model=self.roster.model)
+		self.assertTrue(self.roster.model.iter_is_valid(titerA),
+			msg='Account iter is invalid')
+
+		acc_model = self.roster.model[titerA]
+		self.assertEquals(acc_model[self.C_TYPE], 'account',
+			msg='No account found')
+		
+		if not self.roster.regroup:
+			self.assertEquals(acc_model[self.C_ACCOUNT], acc,
+				msg='Account not found')
+
+			self_jid = gajim.get_jid_from_account(acc)
+			self.assertEquals(acc_model[self.C_JID], self_jid,
+				msg='Account JID not found in account row')
+	
+	def assert_model_is_in_sync(self):
+		#TODO: check that iter_n_children returns the correct numbers
+		pass
+
+	# tests
+	def test_fill_contacts_and_groups_dicts(self):
+		for acc in contacts:
+			self.roster.fill_contacts_and_groups_dicts(contacts[acc], acc)
+			
+			for jid in contacts[acc]:
+				instances = gajim.contacts.get_contacts(acc, jid)
+
+				# Created a contact for each single jid?
+				self.assertTrue(len(instances) == 1)
+				
+				# Contacts kept their info
+				contact = instances[0]
+				self.assertEquals(contact.groups, contacts[acc][jid]['groups'],
+					msg='Group Missmatch')
+				
+				groups = contacts[acc][jid]['groups'] or ['General',]
+
+		# cleanup
+		self.roster.model.clear()
+		for acc in contacts:
+			gajim.contacts.clear_contacts(acc)
+
+	def test_fill_roster_model(self):
+		for acc in contacts:
+			self.roster.fill_contacts_and_groups_dicts(contacts[acc], acc)
+
+			self.roster.add_account(acc)
+			self.assert_account_is_in_roster(acc)
+
+			self.roster.add_account_contacts(acc)	
+			self.assert_all_contacts_are_in_roster(acc)
+			
+		self.assert_model_is_in_sync()
+
+
+class TestRosterWindowRegrouped(TestRosterWindow):
+
+	def setUp(self):
+		gajim.config.set('mergeaccounts', True)
+		TestRosterWindow.setUp(self)
+
+	def test_toggle_regroup(self):
+		self.roster.regroup = not self.roster.regroup
+		self.roster.setup_and_draw_roster()
+		self.roster.regroup = not self.roster.regroup
+		self.roster.setup_and_draw_roster()
+
+
+class TestRosterWindowMetaContacts(TestRosterWindowRegrouped):
+
+	def setUp(self):
+		gajim.contacts.add_metacontact(account1, u'samejid@gajim.org',
+			account2, u'samejid@gajim.org')
+		TestRosterWindowRegrouped.setUp(self)
+
+	def test_connect_new_metacontact(self):
+		self.test_fill_roster_model()
+
+		jid = u'coolstuff@gajim.org'
+		contact = gajim.contacts.create_contact(jid)
+		gajim.contacts.add_contact(account1, contact)
+		self.roster.add_contact(jid, account1)
+		self.roster.chg_contact_status(contact, 'offline', '', account1)
+
+		gajim.contacts.add_metacontact(account1, u'samejid@gajim.org',
+			account1, jid)
+		self.roster.chg_contact_status(contact, 'online', '', account1)
+
+		self.assert_model_is_in_sync()
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# vim: se ts=3:
diff --git a/test/test_sessions.py b/test/test_sessions.py
index a2286b23d..1669157d6 100644
--- a/test/test_sessions.py
+++ b/test/test_sessions.py
@@ -69,8 +69,7 @@ class TestStanzaSession(unittest.TestCase):
 
 from session import ChatControlSession
 
-gajim.interface = MockInterface(account_name)
-gajim.contacts.add_account(account_name)
+gajim.interface = MockInterface()
 
 import notify
 
@@ -203,4 +202,4 @@ class TestChatControlSession(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3: