Added GroupsDAO and more tests