diff --git a/sam/repository/channel_test.go b/sam/repository/channel_test.go
index 9686a9fc3..7d2037642 100644
--- a/sam/repository/channel_test.go
+++ b/sam/repository/channel_test.go
@@ -14,7 +14,7 @@ func TestChannel(t *testing.T) {
 		return
 	}
 
-	rpo := Channel()
+	rpo := New()
 	ctx := context.Background()
 	chn := &types.Channel{}
 
@@ -24,7 +24,7 @@ func TestChannel(t *testing.T) {
 
 	chn.Name = name1
 
-	chn, err = rpo.CreateChannel(ctx, chn)
+	chn, err = rpo.CreateChannel(chn)
 	must(t, err)
 	if chn.Name != name1 {
 		t.Fatal("Changes were not stored")
@@ -32,27 +32,27 @@ func TestChannel(t *testing.T) {
 
 	chn.Name = name2
 
-	chn, err = rpo.UpdateChannel(ctx, chn)
+	chn, err = rpo.UpdateChannel(chn)
 	must(t, err)
 	if chn.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	chn, err = rpo.FindChannelByID(ctx, chn.ID)
+	chn, err = rpo.FindChannelByID(chn.ID)
 	must(t, err)
 	if chn.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	cc, err = rpo.FindChannels(ctx, &types.ChannelFilter{Query: name2})
+	cc, err = rpo.FindChannels(&types.ChannelFilter{Query: name2})
 	must(t, err)
 	if len(cc) == 0 {
 		t.Fatal("No results found")
 	}
 
-	must(t, rpo.ArchiveChannel(ctx, chn.ID))
-	must(t, rpo.UnarchiveChannel(ctx, chn.ID))
-	must(t, rpo.DeleteChannelByID(ctx, chn.ID))
+	must(t, rpo.ArchiveChannelByID(chn.ID))
+	must(t, rpo.UnarchiveChannelByID(chn.ID))
+	must(t, rpo.DeleteChannelByID(chn.ID))
 }
 
 func TestChannelMembers(t *testing.T) {
@@ -63,17 +63,16 @@ func TestChannelMembers(t *testing.T) {
 		return
 	}
 
-	rpo := Channel()
-	ctx := context.Background()
+	rpo := New()
 
 	chn := &types.Channel{}
-	chn, err = rpo.CreateChannel(ctx, chn)
+	chn, err = rpo.CreateChannel(chn)
 	must(t, err)
 
 	usr := &types.User{}
-	usr, err = User().Create(ctx, usr)
+	usr, err = rpo.CreateUser(usr)
 	must(t, err)
 
-	must(t, rpo.AddChannelMember(ctx, chn.ID, usr.ID))
-	must(t, rpo.RemoveChannelMember(ctx, chn.ID, usr.ID))
+	must(t, rpo.AddChannelMember(chn.ID, usr.ID))
+	must(t, rpo.RemoveChannelMember(chn.ID, usr.ID))
 }
diff --git a/sam/repository/message_test.go b/sam/repository/message_test.go
index 63e3d143b..952609906 100644
--- a/sam/repository/message_test.go
+++ b/sam/repository/message_test.go
@@ -1,7 +1,6 @@
 package repository
 
 import (
-	"context"
 	"github.com/crusttech/crust/sam/types"
 	"testing"
 )
@@ -14,8 +13,7 @@ func TestMessage(t *testing.T) {
 		return
 	}
 
-	rpo := Message()
-	ctx := context.Background()
+	rpo := New()
 	msg := &types.Message{}
 
 	var msg1, msg2 = "Test message v1", "Test message v2"
@@ -24,7 +22,7 @@ func TestMessage(t *testing.T) {
 
 	msg.Message = msg1
 
-	msg, err = rpo.CreateMessage(ctx, msg)
+	msg, err = rpo.CreateMessage(msg)
 	must(t, err)
 	if msg.Message != msg1 {
 		t.Fatal("Changes were not stored")
@@ -32,23 +30,23 @@ func TestMessage(t *testing.T) {
 
 	msg.Message = msg2
 
-	msg, err = rpo.Update(ctx, msg)
+	msg, err = rpo.UpdateMessage(msg)
 	must(t, err)
 	if msg.Message != msg2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	msg, err = rpo.FindMessageByID(ctx, msg.ID)
+	msg, err = rpo.FindMessageByID(msg.ID)
 	must(t, err)
 	if msg.Message != msg2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	mm, err = rpo.FindMessages(ctx, &types.MessageFilter{Query: msg2})
+	mm, err = rpo.FindMessages(&types.MessageFilter{Query: msg2})
 	must(t, err)
 	if len(mm) == 0 {
 		t.Fatal("No results found")
 	}
 
-	must(t, rpo.Delete(ctx, msg.ID))
+	must(t, rpo.DeleteMessageByID(msg.ID))
 }
diff --git a/sam/repository/organisation_test.go b/sam/repository/organisation_test.go
index b949217c5..9d5a0626f 100644
--- a/sam/repository/organisation_test.go
+++ b/sam/repository/organisation_test.go
@@ -24,7 +24,7 @@ func TestOrganisation(t *testing.T) {
 
 	org.Name = name1
 
-	org, err = rpo.Create(ctx, org)
+	org, err = rpo.CreateOrganisation(org)
 	must(t, err)
 	if org.Name != name1 {
 		t.Fatal("Changes were not stored")
@@ -32,25 +32,25 @@ func TestOrganisation(t *testing.T) {
 
 	org.Name = name2
 
-	org, err = rpo.Update(ctx, org)
+	org, err = rpo.UpdateOrganisation(org)
 	must(t, err)
 	if org.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	org, err = rpo.FindByID(ctx, org.ID)
+	org, err = rpo.FindOrganisationByID(org.ID)
 	must(t, err)
 	if org.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	oo, err = rpo.Find(ctx, &types.OrganisationFilter{Query: name2})
+	oo, err = rpo.FindOrganisations(&types.OrganisationFilter{Query: name2})
 	must(t, err)
 	if len(oo) == 0 {
 		t.Fatal("No results found")
 	}
 
-	must(t, rpo.Archive(ctx, org.ID))
-	must(t, rpo.Unarchive(ctx, org.ID))
-	must(t, rpo.Delete(ctx, org.ID))
+	must(t, rpo.ArchiveOrganisationByID(org.ID))
+	must(t, rpo.UnarchiveOrganisationByID(org.ID))
+	must(t, rpo.DeleteOrganisationByID(org.ID))
 }
diff --git a/sam/repository/reaction_test.go b/sam/repository/reaction_test.go
index 8182332f2..4a7d90762 100644
--- a/sam/repository/reaction_test.go
+++ b/sam/repository/reaction_test.go
@@ -1,7 +1,6 @@
 package repository
 
 import (
-	"context"
 	"github.com/crusttech/crust/sam/types"
 	"testing"
 )
@@ -14,25 +13,24 @@ func TestReaction(t *testing.T) {
 		return
 	}
 
-	rpo := Reaction()
-	ctx := context.Background()
+	rpo := New()
 	react := &types.Reaction{}
 
 	var reaction = ":laugh:"
 
 	react.Reaction = reaction
 
-	react, err = rpo.Create(ctx, react)
+	react, err = rpo.CreateReaction(react)
 	must(t, err)
 	if react.Reaction != reaction {
 		t.Fatal("Changes were not stored")
 	}
 
-	react, err = rpo.FindByID(ctx, react.ID)
+	react, err = rpo.FindReactionByID(react.ID)
 	must(t, err)
 	if react.Reaction != reaction {
 		t.Fatal("Changes were not stored")
 	}
 
-	must(t, rpo.Delete(ctx, react.ID))
+	must(t, rpo.DeleteReactionByID(react.ID))
 }
diff --git a/sam/repository/team_test.go b/sam/repository/team_test.go
index e791315fe..d11b75122 100644
--- a/sam/repository/team_test.go
+++ b/sam/repository/team_test.go
@@ -1,7 +1,6 @@
 package repository
 
 import (
-	"context"
 	"github.com/crusttech/crust/sam/types"
 	"testing"
 )
@@ -14,8 +13,7 @@ func TestTeam(t *testing.T) {
 		return
 	}
 
-	rpo := Team()
-	ctx := context.Background()
+	rpo := New()
 	team := &types.Team{}
 
 	var name1, name2 = "Test team v1", "Test team v2"
@@ -24,7 +22,7 @@ func TestTeam(t *testing.T) {
 
 	team.Name = name1
 
-	team, err = rpo.Create(ctx, team)
+	team, err = rpo.CreateTeam(team)
 	must(t, err)
 	if team.Name != name1 {
 		t.Fatal("Changes were not stored")
@@ -32,25 +30,25 @@ func TestTeam(t *testing.T) {
 
 	team.Name = name2
 
-	team, err = rpo.Update(ctx, team)
+	team, err = rpo.UpdateTeam(team)
 	must(t, err)
 	if team.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	team, err = rpo.FindByID(ctx, team.ID)
+	team, err = rpo.FindTeamByID(team.ID)
 	must(t, err)
 	if team.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	aa, err = rpo.Find(ctx, &types.TeamFilter{Query: name2})
+	aa, err = rpo.FindTeams(&types.TeamFilter{Query: name2})
 	must(t, err)
 	if len(aa) == 0 {
 		t.Fatal("No results found")
 	}
 
-	must(t, rpo.Archive(ctx, team.ID))
-	must(t, rpo.Unarchive(ctx, team.ID))
-	must(t, rpo.Delete(ctx, team.ID))
+	must(t, rpo.ArchiveTeamByID(team.ID))
+	must(t, rpo.UnarchiveTeamByID(team.ID))
+	must(t, rpo.DeleteTeamByID(team.ID))
 }
diff --git a/sam/repository/user_test.go b/sam/repository/user_test.go
index 86a47cd2c..5569f24b6 100644
--- a/sam/repository/user_test.go
+++ b/sam/repository/user_test.go
@@ -1,7 +1,6 @@
 package repository
 
 import (
-	"context"
 	"github.com/crusttech/crust/sam/types"
 	"testing"
 )
@@ -14,41 +13,40 @@ func TestUser(t *testing.T) {
 		return
 	}
 
-	rpo := User()
-	ctx := context.Background()
-	usr := &types.User{}
+	rpo := New()
+	team := &types.Team{}
 
 	var name1, name2 = "Test user v1", "Test user v2"
 
-	var aa []*types.User
+	var aa []*types.Team
 
-	usr.Username = name1
+	team.Name = name1
 
-	usr, err = rpo.Create(ctx, usr)
+	team, err = rpo.CreateTeam(team)
 	must(t, err)
-	if usr.Username != name1 {
+	if team.Name != name1 {
 		t.Fatal("Changes were not stored")
 	}
 
-	usr.Username = name2
+	team.Name = name2
 
-	usr, err = rpo.Update(ctx, usr)
+	team, err = rpo.UpdateTeam(team)
 	must(t, err)
-	if usr.Username != name2 {
+	if team.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	usr, err = rpo.FindByID(ctx, usr.ID)
+	team, err = rpo.FindTeamByID(team.ID)
 	must(t, err)
-	if usr.Username != name2 {
+	if team.Name != name2 {
 		t.Fatal("Changes were not stored")
 	}
 
-	aa, err = rpo.Find(ctx, &types.UserFilter{Query: name2})
+	aa, err = rpo.FindTeams(&types.TeamFilter{Query: name2})
 	must(t, err)
 	if len(aa) == 0 {
 		t.Fatal("No results found")
 	}
 
-	must(t, rpo.Delete(ctx, usr.ID))
+	must(t, rpo.DeleteTeamByID(team.ID))
 }