app type transition (#7167)

1 files changed, 199 insertions, 187 deletions

diff --git a/app/import_test.go b/app/import_test.go
index 70a36f272..59e767706 100644
--- a/app/import_test.go
+++ b/app/import_test.go
@@ -30,7 +30,8 @@ func ptrBool(b bool) *bool {
 }
 
 func checkPreference(t *testing.T, userId string, category string, name string, value string) {
-	if res := <-Srv.Store.Preference().GetCategory(userId, category); res.Err != nil {
+	a := Global()
+	if res := <-a.Srv.Store.Preference().GetCategory(userId, category); res.Err != nil {
 		debug.PrintStack()
 		t.Fatalf("Failed to get preferences for user %v with category %v", userId, category)
 	} else {
@@ -965,11 +966,12 @@ func TestImportValidateDirectPostImportData(t *testing.T) {
 }
 
 func TestImportImportTeam(t *testing.T) {
-	_ = Setup()
+	a := Global()
+	_ = a.Setup()
 
 	// Check how many teams are in the database.
 	var teamsCount int64
-	if r := <-Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
+	if r := <-a.Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
 		teamsCount = r.Data.(int64)
 	} else {
 		t.Fatalf("Failed to get team count.")
@@ -984,18 +986,18 @@ func TestImportImportTeam(t *testing.T) {
 	}
 
 	// Try importing an invalid team in dryRun mode.
-	if err := ImportTeam(&data, true); err == nil {
+	if err := a.ImportTeam(&data, true); err == nil {
 		t.Fatalf("Should have received an error importing an invalid team.")
 	}
 
 	// Do a valid team in dry-run mode.
 	data.Type = ptrStr("O")
-	if err := ImportTeam(&data, true); err != nil {
+	if err := a.ImportTeam(&data, true); err != nil {
 		t.Fatalf("Received an error validating valid team.")
 	}
 
 	// Check that no more teams are in the DB.
-	if r := <-Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
+	if r := <-a.Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
 		if r.Data.(int64) != teamsCount {
 			t.Fatalf("Teams got persisted in dry run mode.")
 		}
@@ -1005,12 +1007,12 @@ func TestImportImportTeam(t *testing.T) {
 
 	// Do an invalid team in apply mode, check db changes.
 	data.Type = ptrStr("XYZ")
-	if err := ImportTeam(&data, false); err == nil {
+	if err := a.ImportTeam(&data, false); err == nil {
 		t.Fatalf("Import should have failed on invalid team.")
 	}
 
 	// Check that no more teams are in the DB.
-	if r := <-Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
+	if r := <-a.Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
 		if r.Data.(int64) != teamsCount {
 			t.Fatalf("Invalid team got persisted.")
 		}
@@ -1020,12 +1022,12 @@ func TestImportImportTeam(t *testing.T) {
 
 	// Do a valid team in apply mode, check db changes.
 	data.Type = ptrStr("O")
-	if err := ImportTeam(&data, false); err != nil {
+	if err := a.ImportTeam(&data, false); err != nil {
 		t.Fatalf("Received an error importing valid team.")
 	}
 
 	// Check that one more team is in the DB.
-	if r := <-Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
+	if r := <-a.Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
 		if r.Data.(int64)-1 != teamsCount {
 			t.Fatalf("Team did not get saved in apply run mode. analytics=%v teamcount=%v", r.Data.(int64), teamsCount)
 		}
@@ -1034,7 +1036,7 @@ func TestImportImportTeam(t *testing.T) {
 	}
 
 	// Get the team and check that all the fields are correct.
-	if team, err := GetTeamByName(*data.Name); err != nil {
+	if team, err := a.GetTeamByName(*data.Name); err != nil {
 		t.Fatalf("Failed to get team from database.")
 	} else {
 		if team.DisplayName != *data.DisplayName || team.Type != *data.Type || team.Description != *data.Description || team.AllowOpenInvite != *data.AllowOpenInvite {
@@ -1050,11 +1052,11 @@ func TestImportImportTeam(t *testing.T) {
 
 	// Check that the original number of teams are again in the DB (because this query doesn't include deleted).
 	data.Type = ptrStr("O")
-	if err := ImportTeam(&data, false); err != nil {
+	if err := a.ImportTeam(&data, false); err != nil {
 		t.Fatalf("Received an error importing updated valid team.")
 	}
 
-	if r := <-Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
+	if r := <-a.Srv.Store.Team().AnalyticsTeamCount(); r.Err == nil {
 		if r.Data.(int64)-1 != teamsCount {
 			t.Fatalf("Team alterations did not get saved in apply run mode. analytics=%v teamcount=%v", r.Data.(int64), teamsCount)
 		}
@@ -1063,7 +1065,7 @@ func TestImportImportTeam(t *testing.T) {
 	}
 
 	// Get the team and check that all fields are correct.
-	if team, err := GetTeamByName(*data.Name); err != nil {
+	if team, err := a.GetTeamByName(*data.Name); err != nil {
 		t.Fatalf("Failed to get team from database.")
 	} else {
 		if team.DisplayName != *data.DisplayName || team.Type != *data.Type || team.Description != *data.Description || team.AllowOpenInvite != *data.AllowOpenInvite {
@@ -1073,23 +1075,24 @@ func TestImportImportTeam(t *testing.T) {
 }
 
 func TestImportImportChannel(t *testing.T) {
-	_ = Setup()
+	a := Global()
+	_ = a.Setup()
 
 	// Import a Team.
 	teamName := model.NewId()
-	ImportTeam(&TeamImportData{
+	a.ImportTeam(&TeamImportData{
 		Name:        &teamName,
 		DisplayName: ptrStr("Display Name"),
 		Type:        ptrStr("O"),
 	}, false)
-	team, err := GetTeamByName(teamName)
+	team, err := a.GetTeamByName(teamName)
 	if err != nil {
 		t.Fatalf("Failed to get team from database.")
 	}
 
 	// Check how many channels are in the database.
 	var channelCount int64
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		channelCount = r.Data.(int64)
 	} else {
 		t.Fatalf("Failed to get team count.")
@@ -1103,12 +1106,12 @@ func TestImportImportChannel(t *testing.T) {
 		Header:      ptrStr("Channe Header"),
 		Purpose:     ptrStr("Channel Purpose"),
 	}
-	if err := ImportChannel(&data, true); err == nil {
+	if err := a.ImportChannel(&data, true); err == nil {
 		t.Fatalf("Expected error due to invalid name.")
 	}
 
 	// Check that no more channels are in the DB.
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		if r.Data.(int64) != channelCount {
 			t.Fatalf("Channels got persisted in dry run mode.")
 		}
@@ -1119,12 +1122,12 @@ func TestImportImportChannel(t *testing.T) {
 	// Do a valid channel with a nonexistent team in dry-run mode.
 	data.Name = ptrStr("channelname")
 	data.Team = ptrStr(model.NewId())
-	if err := ImportChannel(&data, true); err != nil {
+	if err := a.ImportChannel(&data, true); err != nil {
 		t.Fatalf("Expected success as cannot validate channel name in dry run mode.")
 	}
 
 	// Check that no more channels are in the DB.
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		if r.Data.(int64) != channelCount {
 			t.Fatalf("Channels got persisted in dry run mode.")
 		}
@@ -1134,12 +1137,12 @@ func TestImportImportChannel(t *testing.T) {
 
 	// Do a valid channel in dry-run mode.
 	data.Team = &teamName
-	if err := ImportChannel(&data, true); err != nil {
+	if err := a.ImportChannel(&data, true); err != nil {
 		t.Fatalf("Expected success as valid team.")
 	}
 
 	// Check that no more channels are in the DB.
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		if r.Data.(int64) != channelCount {
 			t.Fatalf("Channels got persisted in dry run mode.")
 		}
@@ -1149,12 +1152,12 @@ func TestImportImportChannel(t *testing.T) {
 
 	// Do an invalid channel in apply mode.
 	data.Name = nil
-	if err := ImportChannel(&data, false); err == nil {
+	if err := a.ImportChannel(&data, false); err == nil {
 		t.Fatalf("Expected error due to invalid name (apply mode).")
 	}
 
 	// Check that no more channels are in the DB.
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		if r.Data.(int64) != channelCount {
 			t.Fatalf("Invalid channel got persisted in apply mode.")
 		}
@@ -1165,12 +1168,12 @@ func TestImportImportChannel(t *testing.T) {
 	// Do a valid channel in apply mode with a nonexistant team.
 	data.Name = ptrStr("channelname")
 	data.Team = ptrStr(model.NewId())
-	if err := ImportChannel(&data, false); err == nil {
+	if err := a.ImportChannel(&data, false); err == nil {
 		t.Fatalf("Expected error due to non-existant team (apply mode).")
 	}
 
 	// Check that no more channels are in the DB.
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		if r.Data.(int64) != channelCount {
 			t.Fatalf("Invalid team channel got persisted in apply mode.")
 		}
@@ -1180,12 +1183,12 @@ func TestImportImportChannel(t *testing.T) {
 
 	// Do a valid channel in apply mode.
 	data.Team = &teamName
-	if err := ImportChannel(&data, false); err != nil {
+	if err := a.ImportChannel(&data, false); err != nil {
 		t.Fatalf("Expected success in apply mode: %v", err.Error())
 	}
 
 	// Check that no more channels are in the DB.
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		if r.Data.(int64) != channelCount+1 {
 			t.Fatalf("Channels did not get persisted in apply mode: found %v expected %v + 1", r.Data.(int64), channelCount)
 		}
@@ -1194,7 +1197,7 @@ func TestImportImportChannel(t *testing.T) {
 	}
 
 	// Get the Channel and check all the fields are correct.
-	if channel, err := GetChannelByName(*data.Name, team.Id); err != nil {
+	if channel, err := a.GetChannelByName(*data.Name, team.Id); err != nil {
 		t.Fatalf("Failed to get channel from database.")
 	} else {
 		if channel.Name != *data.Name || channel.DisplayName != *data.DisplayName || channel.Type != *data.Type || channel.Header != *data.Header || channel.Purpose != *data.Purpose {
@@ -1207,12 +1210,12 @@ func TestImportImportChannel(t *testing.T) {
 	data.Type = ptrStr(model.CHANNEL_PRIVATE)
 	data.Header = ptrStr("New Header")
 	data.Purpose = ptrStr("New Purpose")
-	if err := ImportChannel(&data, false); err != nil {
+	if err := a.ImportChannel(&data, false); err != nil {
 		t.Fatalf("Expected success in apply mode: %v", err.Error())
 	}
 
 	// Check channel count the same.
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); r.Err == nil {
 		if r.Data.(int64) != channelCount {
 			t.Fatalf("Updated channel did not get correctly persisted in apply mode.")
 		}
@@ -1221,7 +1224,7 @@ func TestImportImportChannel(t *testing.T) {
 	}
 
 	// Get the Channel and check all the fields are correct.
-	if channel, err := GetChannelByName(*data.Name, team.Id); err != nil {
+	if channel, err := a.GetChannelByName(*data.Name, team.Id); err != nil {
 		t.Fatalf("Failed to get channel from database.")
 	} else {
 		if channel.Name != *data.Name || channel.DisplayName != *data.DisplayName || channel.Type != *data.Type || channel.Header != *data.Header || channel.Purpose != *data.Purpose {
@@ -1232,11 +1235,12 @@ func TestImportImportChannel(t *testing.T) {
 }
 
 func TestImportImportUser(t *testing.T) {
-	_ = Setup()
+	a := Global()
+	_ = a.Setup()
 
 	// Check how many users are in the database.
 	var userCount int64
-	if r := <-Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
+	if r := <-a.Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
 		userCount = r.Data.(int64)
 	} else {
 		t.Fatalf("Failed to get user count.")
@@ -1246,12 +1250,12 @@ func TestImportImportUser(t *testing.T) {
 	data := UserImportData{
 		Username: ptrStr(model.NewId()),
 	}
-	if err := ImportUser(&data, true); err == nil {
+	if err := a.ImportUser(&data, true); err == nil {
 		t.Fatalf("Should have failed to import invalid user.")
 	}
 
 	// Check that no more users are in the DB.
-	if r := <-Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
+	if r := <-a.Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
 		if r.Data.(int64) != userCount {
 			t.Fatalf("Unexpected number of users")
 		}
@@ -1264,12 +1268,12 @@ func TestImportImportUser(t *testing.T) {
 		Username: ptrStr(model.NewId()),
 		Email:    ptrStr(model.NewId() + "@example.com"),
 	}
-	if err := ImportUser(&data, true); err != nil {
+	if err := a.ImportUser(&data, true); err != nil {
 		t.Fatalf("Should have succeeded to import valid user.")
 	}
 
 	// Check that no more users are in the DB.
-	if r := <-Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
+	if r := <-a.Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
 		if r.Data.(int64) != userCount {
 			t.Fatalf("Unexpected number of users")
 		}
@@ -1281,12 +1285,12 @@ func TestImportImportUser(t *testing.T) {
 	data = UserImportData{
 		Username: ptrStr(model.NewId()),
 	}
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed to import invalid user.")
 	}
 
 	// Check that no more users are in the DB.
-	if r := <-Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
+	if r := <-a.Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
 		if r.Data.(int64) != userCount {
 			t.Fatalf("Unexpected number of users")
 		}
@@ -1304,12 +1308,12 @@ func TestImportImportUser(t *testing.T) {
 		LastName:  ptrStr(model.NewId()),
 		Position:  ptrStr(model.NewId()),
 	}
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded to import valid user.")
 	}
 
 	// Check that one more user is in the DB.
-	if r := <-Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
+	if r := <-a.Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
 		if r.Data.(int64) != userCount+1 {
 			t.Fatalf("Unexpected number of users")
 		}
@@ -1318,7 +1322,7 @@ func TestImportImportUser(t *testing.T) {
 	}
 
 	// Get the user and check all the fields are correct.
-	if user, err := GetUserByUsername(username); err != nil {
+	if user, err := a.GetUserByUsername(username); err != nil {
 		t.Fatalf("Failed to get user from database.")
 	} else {
 		if user.Email != *data.Email || user.Nickname != *data.Nickname || user.FirstName != *data.FirstName || user.LastName != *data.LastName || user.Position != *data.Position {
@@ -1360,12 +1364,12 @@ func TestImportImportUser(t *testing.T) {
 	data.Position = ptrStr(model.NewId())
 	data.Roles = ptrStr("system_admin system_user")
 	data.Locale = ptrStr("zh_CN")
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded to update valid user %v", err)
 	}
 
 	// Check user count the same.
-	if r := <-Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
+	if r := <-a.Srv.Store.User().GetTotalUsersCount(); r.Err == nil {
 		if r.Data.(int64) != userCount+1 {
 			t.Fatalf("Unexpected number of users")
 		}
@@ -1374,7 +1378,7 @@ func TestImportImportUser(t *testing.T) {
 	}
 
 	// Get the user and check all the fields are correct.
-	if user, err := GetUserByUsername(username); err != nil {
+	if user, err := a.GetUserByUsername(username); err != nil {
 		t.Fatalf("Failed to get user from database.")
 	} else {
 		if user.Email != *data.Email || user.Nickname != *data.Nickname || user.FirstName != *data.FirstName || user.LastName != *data.LastName || user.Position != *data.Position {
@@ -1408,22 +1412,22 @@ func TestImportImportUser(t *testing.T) {
 
 	// Check Password and AuthData together.
 	data.Password = ptrStr("PasswordTest")
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed to import invalid user.")
 	}
 
 	data.AuthData = nil
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded to update valid user %v", err)
 	}
 
 	data.Password = ptrStr("")
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed to import invalid user.")
 	}
 
 	data.Password = ptrStr(strings.Repeat("0123456789", 10))
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed to import invalid user.")
 	}
 
@@ -1431,24 +1435,24 @@ func TestImportImportUser(t *testing.T) {
 
 	// Test team and channel memberships
 	teamName := model.NewId()
-	ImportTeam(&TeamImportData{
+	a.ImportTeam(&TeamImportData{
 		Name:        &teamName,
 		DisplayName: ptrStr("Display Name"),
 		Type:        ptrStr("O"),
 	}, false)
-	team, err := GetTeamByName(teamName)
+	team, err := a.GetTeamByName(teamName)
 	if err != nil {
 		t.Fatalf("Failed to get team from database.")
 	}
 
 	channelName := model.NewId()
-	ImportChannel(&ChannelImportData{
+	a.ImportChannel(&ChannelImportData{
 		Team:        &teamName,
 		Name:        &channelName,
 		DisplayName: ptrStr("Display Name"),
 		Type:        ptrStr("O"),
 	}, false)
-	channel, err := GetChannelByName(channelName, team.Id)
+	channel, err := a.GetChannelByName(channelName, team.Id)
 	if err != nil {
 		t.Fatalf("Failed to get channel from database.")
 	}
@@ -1463,13 +1467,13 @@ func TestImportImportUser(t *testing.T) {
 		Position:  ptrStr(model.NewId()),
 	}
 
-	teamMembers, err := GetTeamMembers(team.Id, 0, 1000)
+	teamMembers, err := a.GetTeamMembers(team.Id, 0, 1000)
 	if err != nil {
 		t.Fatalf("Failed to get team member count")
 	}
 	teamMemberCount := len(teamMembers)
 
-	channelMemberCount, err := GetChannelMemberCount(channel.Id)
+	channelMemberCount, err := a.GetChannelMemberCount(channel.Id)
 	if err != nil {
 		t.Fatalf("Failed to get channel member count")
 	}
@@ -1485,7 +1489,7 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, true); err == nil {
+	if err := a.ImportUser(&data, true); err == nil {
 		t.Fatalf("Should have failed.")
 	}
 
@@ -1500,7 +1504,7 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, true); err == nil {
+	if err := a.ImportUser(&data, true); err == nil {
 		t.Fatalf("Should have failed.")
 	}
 
@@ -1515,7 +1519,7 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, true); err == nil {
+	if err := a.ImportUser(&data, true); err == nil {
 		t.Fatalf("Should have failed.")
 	}
 
@@ -1530,7 +1534,7 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, true); err != nil {
+	if err := a.ImportUser(&data, true); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
@@ -1545,18 +1549,18 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, true); err != nil {
+	if err := a.ImportUser(&data, true); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
 	// Check no new member objects were created because dry run mode.
-	if tmc, err := GetTeamMembers(team.Id, 0, 1000); err != nil {
+	if tmc, err := a.GetTeamMembers(team.Id, 0, 1000); err != nil {
 		t.Fatalf("Failed to get Team Member Count")
 	} else if len(tmc) != teamMemberCount {
 		t.Fatalf("Number of team members not as expected")
 	}
 
-	if cmc, err := GetChannelMemberCount(channel.Id); err != nil {
+	if cmc, err := a.GetChannelMemberCount(channel.Id); err != nil {
 		t.Fatalf("Failed to get Channel Member Count")
 	} else if cmc != channelMemberCount {
 		t.Fatalf("Number of channel members not as expected")
@@ -1573,7 +1577,7 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed.")
 	}
 
@@ -1588,7 +1592,7 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed.")
 	}
 
@@ -1603,18 +1607,18 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed.")
 	}
 
 	// Check no new member objects were created because all tests should have failed so far.
-	if tmc, err := GetTeamMembers(team.Id, 0, 1000); err != nil {
+	if tmc, err := a.GetTeamMembers(team.Id, 0, 1000); err != nil {
 		t.Fatalf("Failed to get Team Member Count")
 	} else if len(tmc) != teamMemberCount {
 		t.Fatalf("Number of team members not as expected")
 	}
 
-	if cmc, err := GetChannelMemberCount(channel.Id); err != nil {
+	if cmc, err := a.GetChannelMemberCount(channel.Id); err != nil {
 		t.Fatalf("Failed to get Channel Member Count")
 	} else if cmc != channelMemberCount {
 		t.Fatalf("Number of channel members not as expected")
@@ -1631,29 +1635,29 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, false); err == nil {
+	if err := a.ImportUser(&data, false); err == nil {
 		t.Fatalf("Should have failed.")
 	}
 
 	// Check only new team member object created because dry run mode.
-	if tmc, err := GetTeamMembers(team.Id, 0, 1000); err != nil {
+	if tmc, err := a.GetTeamMembers(team.Id, 0, 1000); err != nil {
 		t.Fatalf("Failed to get Team Member Count")
 	} else if len(tmc) != teamMemberCount+1 {
 		t.Fatalf("Number of team members not as expected")
 	}
 
-	if cmc, err := GetChannelMemberCount(channel.Id); err != nil {
+	if cmc, err := a.GetChannelMemberCount(channel.Id); err != nil {
 		t.Fatalf("Failed to get Channel Member Count")
 	} else if cmc != channelMemberCount {
 		t.Fatalf("Number of channel members not as expected")
 	}
 
 	// Check team member properties.
-	user, err := GetUserByUsername(username)
+	user, err := a.GetUserByUsername(username)
 	if err != nil {
 		t.Fatalf("Failed to get user from database.")
 	}
-	if teamMember, err := GetTeamMember(team.Id, user.Id); err != nil {
+	if teamMember, err := a.GetTeamMember(team.Id, user.Id); err != nil {
 		t.Fatalf("Failed to get team member from database.")
 	} else if teamMember.Roles != "team_user" {
 		t.Fatalf("Team member properties not as expected")
@@ -1670,25 +1674,25 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
 	// Check only new channel member object created because dry run mode.
-	if tmc, err := GetTeamMembers(team.Id, 0, 1000); err != nil {
+	if tmc, err := a.GetTeamMembers(team.Id, 0, 1000); err != nil {
 		t.Fatalf("Failed to get Team Member Count")
 	} else if len(tmc) != teamMemberCount+1 {
 		t.Fatalf("Number of team members not as expected")
 	}
 
-	if cmc, err := GetChannelMemberCount(channel.Id); err != nil {
+	if cmc, err := a.GetChannelMemberCount(channel.Id); err != nil {
 		t.Fatalf("Failed to get Channel Member Count")
 	} else if cmc != channelMemberCount+1 {
 		t.Fatalf("Number of channel members not as expected")
 	}
 
 	// Check channel member properties.
-	if channelMember, err := GetChannelMember(channel.Id, user.Id); err != nil {
+	if channelMember, err := a.GetChannelMember(channel.Id, user.Id); err != nil {
 		t.Fatalf("Failed to get channel member from database.")
 	} else if channelMember.Roles != "channel_user" || channelMember.NotifyProps[model.DESKTOP_NOTIFY_PROP] != "default" || channelMember.NotifyProps[model.PUSH_NOTIFY_PROP] != "default" || channelMember.NotifyProps[model.MARK_UNREAD_NOTIFY_PROP] != "all" {
 		t.Fatalf("Channel member properties not as expected")
@@ -1713,18 +1717,18 @@ func TestImportImportUser(t *testing.T) {
 			},
 		},
 	}
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
 	// Check both member properties.
-	if teamMember, err := GetTeamMember(team.Id, user.Id); err != nil {
+	if teamMember, err := a.GetTeamMember(team.Id, user.Id); err != nil {
 		t.Fatalf("Failed to get team member from database.")
 	} else if teamMember.Roles != "team_user team_admin" {
 		t.Fatalf("Team member properties not as expected: %v", teamMember.Roles)
 	}
 
-	if channelMember, err := GetChannelMember(channel.Id, user.Id); err != nil {
+	if channelMember, err := a.GetChannelMember(channel.Id, user.Id); err != nil {
 		t.Fatalf("Failed to get channel member Desktop from database.")
 	} else if channelMember.Roles != "channel_user channel_admin" || channelMember.NotifyProps[model.DESKTOP_NOTIFY_PROP] != model.USER_NOTIFY_MENTION || channelMember.NotifyProps[model.PUSH_NOTIFY_PROP] != model.USER_NOTIFY_MENTION || channelMember.NotifyProps[model.MARK_UNREAD_NOTIFY_PROP] != model.USER_NOTIFY_MENTION {
 		t.Fatalf("Channel member properties not as expected")
@@ -1733,13 +1737,13 @@ func TestImportImportUser(t *testing.T) {
 	checkPreference(t, user.Id, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id, "true")
 
 	// No more new member objects.
-	if tmc, err := GetTeamMembers(team.Id, 0, 1000); err != nil {
+	if tmc, err := a.GetTeamMembers(team.Id, 0, 1000); err != nil {
 		t.Fatalf("Failed to get Team Member Count")
 	} else if len(tmc) != teamMemberCount+1 {
 		t.Fatalf("Number of team members not as expected")
 	}
 
-	if cmc, err := GetChannelMemberCount(channel.Id); err != nil {
+	if cmc, err := a.GetChannelMemberCount(channel.Id); err != nil {
 		t.Fatalf("Failed to get Channel Member Count")
 	} else if cmc != channelMemberCount+1 {
 		t.Fatalf("Number of channel members not as expected")
@@ -1757,12 +1761,12 @@ func TestImportImportUser(t *testing.T) {
 		ChannelDisplayMode: ptrStr("centered"),
 		TutorialStep:       ptrStr("3"),
 	}
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
 	// Check their values.
-	user, err = GetUserByUsername(username)
+	user, err = a.GetUserByUsername(username)
 	if err != nil {
 		t.Fatalf("Failed to get user from database.")
 	}
@@ -1785,7 +1789,7 @@ func TestImportImportUser(t *testing.T) {
 		ChannelDisplayMode: ptrStr("full"),
 		TutorialStep:       ptrStr("2"),
 	}
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
@@ -1809,11 +1813,11 @@ func TestImportImportUser(t *testing.T) {
 		CommentsTrigger:  ptrStr(model.COMMENTS_NOTIFY_ROOT),
 		MentionKeys:      ptrStr("valid,misc"),
 	}
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
-	user, err = GetUserByUsername(username)
+	user, err = a.GetUserByUsername(username)
 	if err != nil {
 		t.Fatalf("Failed to get user from database.")
 	}
@@ -1840,11 +1844,11 @@ func TestImportImportUser(t *testing.T) {
 		CommentsTrigger:  ptrStr(model.COMMENTS_NOTIFY_ANY),
 		MentionKeys:      ptrStr("misc"),
 	}
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
-	user, err = GetUserByUsername(username)
+	user, err = a.GetUserByUsername(username)
 	if err != nil {
 		t.Fatalf("Failed to get user from database.")
 	}
@@ -1862,8 +1866,8 @@ func TestImportImportUser(t *testing.T) {
 	// Check Notify Props get set on *create* user.
 	username = model.NewId()
 	data = UserImportData{
-		Username:           &username,
-		Email:              ptrStr(model.NewId() + "@example.com"),
+		Username: &username,
+		Email:    ptrStr(model.NewId() + "@example.com"),
 	}
 	data.NotifyProps = &UserNotifyPropsImportData{
 		Desktop:          ptrStr(model.USER_NOTIFY_MENTION),
@@ -1877,11 +1881,11 @@ func TestImportImportUser(t *testing.T) {
 		MentionKeys:      ptrStr("misc"),
 	}
 
-	if err := ImportUser(&data, false); err != nil {
+	if err := a.ImportUser(&data, false); err != nil {
 		t.Fatalf("Should have succeeded.")
 	}
 
-	user, err = GetUserByUsername(username)
+	user, err = a.GetUserByUsername(username)
 	if err != nil {
 		t.Fatalf("Failed to get user from database.")
 	}
@@ -1898,7 +1902,8 @@ func TestImportImportUser(t *testing.T) {
 }
 
 func AssertAllPostsCount(t *testing.T, initialCount int64, change int64, teamName string) {
-	if result := <-Srv.Store.Post().AnalyticsPostCount(teamName, false, false); result.Err != nil {
+	a := Global()
+	if result := <-a.Srv.Store.Post().AnalyticsPostCount(teamName, false, false); result.Err != nil {
 		t.Fatal(result.Err)
 	} else {
 		if initialCount+change != result.Data.(int64) {
@@ -1909,47 +1914,48 @@ func AssertAllPostsCount(t *testing.T, initialCount int64, change int64, teamNam
 }
 
 func TestImportImportPost(t *testing.T) {
-	_ = Setup()
+	a := Global()
+	_ = a.Setup()
 
 	// Create a Team.
 	teamName := model.NewId()
-	ImportTeam(&TeamImportData{
+	a.ImportTeam(&TeamImportData{
 		Name:        &teamName,
 		DisplayName: ptrStr("Display Name"),
 		Type:        ptrStr("O"),
 	}, false)
-	team, err := GetTeamByName(teamName)
+	team, err := a.GetTeamByName(teamName)
 	if err != nil {
 		t.Fatalf("Failed to get team from database.")
 	}
 
 	// Create a Channel.
 	channelName := model.NewId()
-	ImportChannel(&ChannelImportData{
+	a.ImportChannel(&ChannelImportData{
 		Team:        &teamName,
 		Name:        &channelName,
 		DisplayName: ptrStr("Display Name"),
 		Type:        ptrStr("O"),
 	}, false)
-	channel, err := GetChannelByName(channelName, team.Id)
+	channel, err := a.GetChannelByName(channelName, team.Id)
 	if err != nil {
 		t.Fatalf("Failed to get channel from database.")
 	}
 
 	// Create a user.
 	username := model.NewId()
-	ImportUser(&UserImportData{
+	a.ImportUser(&UserImportData{
 		Username: &username,
 		Email:    ptrStr(model.NewId() + "@example.com"),
 	}, false)
-	user, err := GetUserByUsername(username)
+	user, err := a.GetUserByUsername(username)
 	if err != nil {
 		t.Fatalf("Failed to get user from database.")
 	}
 
 	// Count the number of posts in the testing team.
 	var initialPostCount int64
-	if result := <-Srv.Store.Post().AnalyticsPostCount(team.Id, false, false); result.Err != nil {
+	if result := <-a.Srv.Store.Post().AnalyticsPostCount(team.Id, false, false); result.Err != nil {
 		t.Fatal(result.Err)
 	} else {
 		initialPostCount = result.Data.(int64)
@@ -1961,7 +1967,7 @@ func TestImportImportPost(t *testing.T) {
 		Channel: &channelName,
 		User:    &username,
 	}
-	if err := ImportPost(data, true); err == nil {
+	if err := a.ImportPost(data, true); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, team.Id)
@@ -1974,7 +1980,7 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Hello"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportPost(data, true); err != nil {
+	if err := a.ImportPost(data, true); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, team.Id)
@@ -1986,7 +1992,7 @@ func TestImportImportPost(t *testing.T) {
 		User:     &username,
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportPost(data, false); err == nil {
+	if err := a.ImportPost(data, false); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, team.Id)
@@ -1999,7 +2005,7 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportPost(data, false); err == nil {
+	if err := a.ImportPost(data, false); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, team.Id)
@@ -2012,7 +2018,7 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportPost(data, false); err == nil {
+	if err := a.ImportPost(data, false); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, team.Id)
@@ -2025,7 +2031,7 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportPost(data, false); err == nil {
+	if err := a.ImportPost(data, false); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, team.Id)
@@ -2039,13 +2045,13 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: &time,
 	}
-	if err := ImportPost(data, false); err != nil {
+	if err := a.ImportPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 1, team.Id)
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(channel.Id, time); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(channel.Id, time); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2066,13 +2072,13 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: &time,
 	}
-	if err := ImportPost(data, false); err != nil {
+	if err := a.ImportPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 1, team.Id)
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(channel.Id, time); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(channel.Id, time); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2094,7 +2100,7 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: &newTime,
 	}
-	if err := ImportPost(data, false); err != nil {
+	if err := a.ImportPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 2, team.Id)
@@ -2107,7 +2113,7 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message 2"),
 		CreateAt: &time,
 	}
-	if err := ImportPost(data, false); err != nil {
+	if err := a.ImportPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 3, team.Id)
@@ -2121,12 +2127,12 @@ func TestImportImportPost(t *testing.T) {
 		Message:  ptrStr("Message 2 #hashtagmashupcity"),
 		CreateAt: &hashtagTime,
 	}
-	if err := ImportPost(data, false); err != nil {
+	if err := a.ImportPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 4, team.Id)
 
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(channel.Id, hashtagTime); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(channel.Id, hashtagTime); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2144,11 +2150,11 @@ func TestImportImportPost(t *testing.T) {
 
 	// Post with flags.
 	username2 := model.NewId()
-	ImportUser(&UserImportData{
+	a.ImportUser(&UserImportData{
 		Username: &username2,
 		Email:    ptrStr(model.NewId() + "@example.com"),
 	}, false)
-	user2, err := GetUserByUsername(username2)
+	user2, err := a.GetUserByUsername(username2)
 	if err != nil {
 		t.Fatalf("Failed to get user from database.")
 	}
@@ -2165,13 +2171,13 @@ func TestImportImportPost(t *testing.T) {
 			username2,
 		},
 	}
-	if err := ImportPost(data, false); err != nil {
+	if err := a.ImportPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 5, team.Id)
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(channel.Id, flagsTime); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(channel.Id, flagsTime); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2189,18 +2195,19 @@ func TestImportImportPost(t *testing.T) {
 }
 
 func TestImportImportDirectChannel(t *testing.T) {
-	th := Setup().InitBasic()
+	a := Global()
+	th := a.Setup().InitBasic()
 
 	// Check how many channels are in the database.
 	var directChannelCount int64
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_DIRECT); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_DIRECT); r.Err == nil {
 		directChannelCount = r.Data.(int64)
 	} else {
 		t.Fatalf("Failed to get direct channel count.")
 	}
 
 	var groupChannelCount int64
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_GROUP); r.Err == nil {
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_GROUP); r.Err == nil {
 		groupChannelCount = r.Data.(int64)
 	} else {
 		t.Fatalf("Failed to get group channel count.")
@@ -2213,7 +2220,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 		},
 		Header: ptrStr("Channel Header"),
 	}
-	if err := ImportDirectChannel(&data, true); err == nil {
+	if err := a.ImportDirectChannel(&data, true); err == nil {
 		t.Fatalf("Expected error due to invalid name.")
 	}
 
@@ -2226,7 +2233,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 		model.NewId(),
 		model.NewId(),
 	}
-	if err := ImportDirectChannel(&data, true); err != nil {
+	if err := a.ImportDirectChannel(&data, true); err != nil {
 		t.Fatalf("Expected success as cannot validate existance of channel members in dry run mode.")
 	}
 
@@ -2240,7 +2247,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 		model.NewId(),
 		model.NewId(),
 	}
-	if err := ImportDirectChannel(&data, true); err != nil {
+	if err := a.ImportDirectChannel(&data, true); err != nil {
 		t.Fatalf("Expected success as cannot validate existance of channel members in dry run mode.")
 	}
 
@@ -2252,7 +2259,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 	data.Members = &[]string{
 		model.NewId(),
 	}
-	if err := ImportDirectChannel(&data, false); err == nil {
+	if err := a.ImportDirectChannel(&data, false); err == nil {
 		t.Fatalf("Expected error due to invalid member (apply mode).")
 	}
 
@@ -2265,7 +2272,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 		th.BasicUser.Username,
 		th.BasicUser2.Username,
 	}
-	if err := ImportDirectChannel(&data, false); err != nil {
+	if err := a.ImportDirectChannel(&data, false); err != nil {
 		t.Fatalf("Expected success: %v", err.Error())
 	}
 
@@ -2274,7 +2281,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 	AssertChannelCount(t, model.CHANNEL_GROUP, groupChannelCount)
 
 	// Do the same DIRECT channel again.
-	if err := ImportDirectChannel(&data, false); err != nil {
+	if err := a.ImportDirectChannel(&data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 
@@ -2284,7 +2291,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 
 	// Update the channel's HEADER
 	data.Header = ptrStr("New Channel Header 2")
-	if err := ImportDirectChannel(&data, false); err != nil {
+	if err := a.ImportDirectChannel(&data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 
@@ -2293,7 +2300,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 	AssertChannelCount(t, model.CHANNEL_GROUP, groupChannelCount)
 
 	// Get the channel to check that the header was updated.
-	if channel, err := createDirectChannel(th.BasicUser.Id, th.BasicUser2.Id); err == nil || err.Id != store.CHANNEL_EXISTS_ERROR {
+	if channel, err := a.createDirectChannel(th.BasicUser.Id, th.BasicUser2.Id); err == nil || err.Id != store.CHANNEL_EXISTS_ERROR {
 		t.Fatal("Should have got store.CHANNEL_EXISTS_ERROR")
 	} else {
 		if channel.Header != *data.Header {
@@ -2309,7 +2316,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 		user3.Username,
 		model.NewId(),
 	}
-	if err := ImportDirectChannel(&data, false); err == nil {
+	if err := a.ImportDirectChannel(&data, false); err == nil {
 		t.Fatalf("Should have failed due to invalid member in list.")
 	}
 
@@ -2323,7 +2330,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 		th.BasicUser2.Username,
 		user3.Username,
 	}
-	if err := ImportDirectChannel(&data, false); err != nil {
+	if err := a.ImportDirectChannel(&data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 
@@ -2332,7 +2339,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 	AssertChannelCount(t, model.CHANNEL_GROUP, groupChannelCount+1)
 
 	// Do the same DIRECT channel again.
-	if err := ImportDirectChannel(&data, false); err != nil {
+	if err := a.ImportDirectChannel(&data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 
@@ -2342,7 +2349,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 
 	// Update the channel's HEADER
 	data.Header = ptrStr("New Channel Header 3")
-	if err := ImportDirectChannel(&data, false); err != nil {
+	if err := a.ImportDirectChannel(&data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 
@@ -2356,7 +2363,7 @@ func TestImportImportDirectChannel(t *testing.T) {
 		th.BasicUser2.Id,
 		user3.Id,
 	}
-	if channel, err := createGroupChannel(userIds, th.BasicUser.Id); err.Id != store.CHANNEL_EXISTS_ERROR {
+	if channel, err := a.createGroupChannel(userIds, th.BasicUser.Id); err.Id != store.CHANNEL_EXISTS_ERROR {
 		t.Fatal("Should have got store.CHANNEL_EXISTS_ERROR")
 	} else {
 		if channel.Header != *data.Header {
@@ -2373,11 +2380,11 @@ func TestImportImportDirectChannel(t *testing.T) {
 		th.BasicUser.Username,
 		th.BasicUser2.Username,
 	}
-	if err := ImportDirectChannel(&data, false); err != nil {
+	if err := a.ImportDirectChannel(&data, false); err != nil {
 		t.Fatal(err)
 	}
 
-	if channel, err := createDirectChannel(th.BasicUser.Id, th.BasicUser2.Id); err == nil || err.Id != store.CHANNEL_EXISTS_ERROR {
+	if channel, err := a.createDirectChannel(th.BasicUser.Id, th.BasicUser2.Id); err == nil || err.Id != store.CHANNEL_EXISTS_ERROR {
 		t.Fatal("Should have got store.CHANNEL_EXISTS_ERROR")
 	} else {
 		checkPreference(t, th.BasicUser.Id, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id, "true")
@@ -2386,7 +2393,8 @@ func TestImportImportDirectChannel(t *testing.T) {
 }
 
 func AssertChannelCount(t *testing.T, channelType string, expectedCount int64) {
-	if r := <-Srv.Store.Channel().AnalyticsTypeCount("", channelType); r.Err == nil {
+	a := Global()
+	if r := <-a.Srv.Store.Channel().AnalyticsTypeCount("", channelType); r.Err == nil {
 		count := r.Data.(int64)
 		if count != expectedCount {
 			debug.PrintStack()
@@ -2399,7 +2407,8 @@ func AssertChannelCount(t *testing.T, channelType string, expectedCount int64) {
 }
 
 func TestImportImportDirectPost(t *testing.T) {
-	th := Setup().InitBasic()
+	a := Global()
+	th := a.Setup().InitBasic()
 
 	// Create the DIRECT channel.
 	channelData := DirectChannelImportData{
@@ -2408,13 +2417,13 @@ func TestImportImportDirectPost(t *testing.T) {
 			th.BasicUser2.Username,
 		},
 	}
-	if err := ImportDirectChannel(&channelData, false); err != nil {
+	if err := a.ImportDirectChannel(&channelData, false); err != nil {
 		t.Fatalf("Expected success: %v", err.Error())
 	}
 
 	// Get the channel.
 	var directChannel *model.Channel
-	if channel, err := createDirectChannel(th.BasicUser.Id, th.BasicUser2.Id); err.Id != store.CHANNEL_EXISTS_ERROR {
+	if channel, err := a.createDirectChannel(th.BasicUser.Id, th.BasicUser2.Id); err.Id != store.CHANNEL_EXISTS_ERROR {
 		t.Fatal("Should have got store.CHANNEL_EXISTS_ERROR")
 	} else {
 		directChannel = channel
@@ -2422,7 +2431,7 @@ func TestImportImportDirectPost(t *testing.T) {
 
 	// Get the number of posts in the system.
 	var initialPostCount int64
-	if result := <-Srv.Store.Post().AnalyticsPostCount("", false, false); result.Err != nil {
+	if result := <-a.Srv.Store.Post().AnalyticsPostCount("", false, false); result.Err != nil {
 		t.Fatal(result.Err)
 	} else {
 		initialPostCount = result.Data.(int64)
@@ -2437,7 +2446,7 @@ func TestImportImportDirectPost(t *testing.T) {
 		User:     ptrStr(th.BasicUser.Username),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, true); err == nil {
+	if err := a.ImportDirectPost(data, true); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, "")
@@ -2452,7 +2461,7 @@ func TestImportImportDirectPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, true); err != nil {
+	if err := a.ImportDirectPost(data, true); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, "")
@@ -2467,7 +2476,7 @@ func TestImportImportDirectPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, false); err == nil {
+	if err := a.ImportDirectPost(data, false); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, "")
@@ -2482,13 +2491,13 @@ func TestImportImportDirectPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success: %v", err.Error())
 	}
 	AssertAllPostsCount(t, initialPostCount, 1, "")
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2502,13 +2511,13 @@ func TestImportImportDirectPost(t *testing.T) {
 	}
 
 	// Import the post again.
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 1, "")
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2523,14 +2532,14 @@ func TestImportImportDirectPost(t *testing.T) {
 
 	// Save the post with a different time.
 	data.CreateAt = ptrInt64(*data.CreateAt + 1)
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 2, "")
 
 	// Save the post with a different message.
 	data.Message = ptrStr("Message 2")
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 3, "")
@@ -2538,12 +2547,12 @@ func TestImportImportDirectPost(t *testing.T) {
 	// Test with hashtags
 	data.Message = ptrStr("Message 2 #hashtagmashupcity")
 	data.CreateAt = ptrInt64(*data.CreateAt + 1)
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 4, "")
 
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2574,12 +2583,12 @@ func TestImportImportDirectPost(t *testing.T) {
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
 
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success: %v", err.Error())
 	}
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(directChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2602,7 +2611,7 @@ func TestImportImportDirectPost(t *testing.T) {
 			user3.Username,
 		},
 	}
-	if err := ImportDirectChannel(&channelData, false); err != nil {
+	if err := a.ImportDirectChannel(&channelData, false); err != nil {
 		t.Fatalf("Expected success: %v", err.Error())
 	}
 
@@ -2613,14 +2622,14 @@ func TestImportImportDirectPost(t *testing.T) {
 		th.BasicUser2.Id,
 		user3.Id,
 	}
-	if channel, err := createGroupChannel(userIds, th.BasicUser.Id); err.Id != store.CHANNEL_EXISTS_ERROR {
+	if channel, err := a.createGroupChannel(userIds, th.BasicUser.Id); err.Id != store.CHANNEL_EXISTS_ERROR {
 		t.Fatal("Should have got store.CHANNEL_EXISTS_ERROR")
 	} else {
 		groupChannel = channel
 	}
 
 	// Get the number of posts in the system.
-	if result := <-Srv.Store.Post().AnalyticsPostCount("", false, false); result.Err != nil {
+	if result := <-a.Srv.Store.Post().AnalyticsPostCount("", false, false); result.Err != nil {
 		t.Fatal(result.Err)
 	} else {
 		initialPostCount = result.Data.(int64)
@@ -2636,7 +2645,7 @@ func TestImportImportDirectPost(t *testing.T) {
 		User:     ptrStr(th.BasicUser.Username),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, true); err == nil {
+	if err := a.ImportDirectPost(data, true); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, "")
@@ -2652,7 +2661,7 @@ func TestImportImportDirectPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, true); err != nil {
+	if err := a.ImportDirectPost(data, true); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, "")
@@ -2669,7 +2678,7 @@ func TestImportImportDirectPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, false); err == nil {
+	if err := a.ImportDirectPost(data, false); err == nil {
 		t.Fatalf("Expected error.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 0, "")
@@ -2685,13 +2694,13 @@ func TestImportImportDirectPost(t *testing.T) {
 		Message:  ptrStr("Message"),
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success: %v", err.Error())
 	}
 	AssertAllPostsCount(t, initialPostCount, 1, "")
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2705,13 +2714,13 @@ func TestImportImportDirectPost(t *testing.T) {
 	}
 
 	// Import the post again.
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 1, "")
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2726,14 +2735,14 @@ func TestImportImportDirectPost(t *testing.T) {
 
 	// Save the post with a different time.
 	data.CreateAt = ptrInt64(*data.CreateAt + 1)
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 2, "")
 
 	// Save the post with a different message.
 	data.Message = ptrStr("Message 2")
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 3, "")
@@ -2741,12 +2750,12 @@ func TestImportImportDirectPost(t *testing.T) {
 	// Test with hashtags
 	data.Message = ptrStr("Message 2 #hashtagmashupcity")
 	data.CreateAt = ptrInt64(*data.CreateAt + 1)
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success.")
 	}
 	AssertAllPostsCount(t, initialPostCount, 4, "")
 
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2778,12 +2787,12 @@ func TestImportImportDirectPost(t *testing.T) {
 		CreateAt: ptrInt64(model.GetMillis()),
 	}
 
-	if err := ImportDirectPost(data, false); err != nil {
+	if err := a.ImportDirectPost(data, false); err != nil {
 		t.Fatalf("Expected success: %v", err.Error())
 	}
 
 	// Check the post values.
-	if result := <-Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
+	if result := <-a.Srv.Store.Post().GetPostsCreatedAt(groupChannel.Id, *data.CreateAt); result.Err != nil {
 		t.Fatal(result.Err.Error())
 	} else {
 		posts := result.Data.([]*model.Post)
@@ -2797,56 +2806,58 @@ func TestImportImportDirectPost(t *testing.T) {
 }
 
 func TestImportImportLine(t *testing.T) {
-	_ = Setup()
+	a := Global()
+	_ = a.Setup()
 
 	// Try import line with an invalid type.
 	line := LineImportData{
 		Type: "gibberish",
 	}
 
-	if err := ImportLine(line, false); err == nil {
+	if err := a.ImportLine(line, false); err == nil {
 		t.Fatalf("Expected an error when importing a line with invalid type.")
 	}
 
 	// Try import line with team type but nil team.
 	line.Type = "team"
-	if err := ImportLine(line, false); err == nil {
+	if err := a.ImportLine(line, false); err == nil {
 		t.Fatalf("Expected an error when importing a line of type team with a nil team.")
 	}
 
 	// Try import line with channel type but nil channel.
 	line.Type = "channel"
-	if err := ImportLine(line, false); err == nil {
+	if err := a.ImportLine(line, false); err == nil {
 		t.Fatalf("Expected an error when importing a line with type channel with a nil channel.")
 	}
 
 	// Try import line with user type but nil user.
 	line.Type = "user"
-	if err := ImportLine(line, false); err == nil {
+	if err := a.ImportLine(line, false); err == nil {
 		t.Fatalf("Expected an error when importing a line with type uesr with a nil user.")
 	}
 
 	// Try import line with post type but nil post.
 	line.Type = "post"
-	if err := ImportLine(line, false); err == nil {
+	if err := a.ImportLine(line, false); err == nil {
 		t.Fatalf("Expected an error when importing a line with type post with a nil post.")
 	}
 
 	// Try import line with direct_channel type but nil direct_channel.
 	line.Type = "direct_channel"
-	if err := ImportLine(line, false); err == nil {
+	if err := a.ImportLine(line, false); err == nil {
 		t.Fatalf("Expected an error when importing a line with type direct_channel with a nil direct_channel.")
 	}
 
 	// Try import line with direct_post type but nil direct_post.
 	line.Type = "direct_post"
-	if err := ImportLine(line, false); err == nil {
+	if err := a.ImportLine(line, false); err == nil {
 		t.Fatalf("Expected an error when importing a line with type direct_post with a nil direct_post.")
 	}
 }
 
 func TestImportBulkImport(t *testing.T) {
-	_ = Setup()
+	a := Global()
+	_ = a.Setup()
 
 	teamName := model.NewId()
 	channelName := model.NewId()
@@ -2867,13 +2878,13 @@ func TestImportBulkImport(t *testing.T) {
 {"type": "direct_post", "direct_post": {"channel_members": ["` + username + `", "` + username2 + `"], "user": "` + username + `", "message": "Hello Direct Channel", "create_at": 123456789013}}
 {"type": "direct_post", "direct_post": {"channel_members": ["` + username + `", "` + username2 + `", "` + username3 + `"], "user": "` + username + `", "message": "Hello Group Channel", "create_at": 123456789014}}`
 
-	if err, line := BulkImport(strings.NewReader(data1), false, 2); err != nil || line != 0 {
+	if err, line := a.BulkImport(strings.NewReader(data1), false, 2); err != nil || line != 0 {
 		t.Fatalf("BulkImport should have succeeded: %v, %v", err.Error(), line)
 	}
 
 	// Run bulk import using a string that contains a line with invalid json.
 	data2 := `{"type": "version", "version": 1`
-	if err, line := BulkImport(strings.NewReader(data2), false, 2); err == nil || line != 1 {
+	if err, line := a.BulkImport(strings.NewReader(data2), false, 2); err == nil || line != 1 {
 		t.Fatalf("Should have failed due to invalid JSON on line 1.")
 	}
 
@@ -2882,13 +2893,14 @@ func TestImportBulkImport(t *testing.T) {
 {"type": "channel", "channel": {"type": "O", "display_name": "xr6m6udffngark2uekvr3hoeny", "team": "` + teamName + `", "name": "` + channelName + `"}}
 {"type": "user", "user": {"username": "kufjgnkxkrhhfgbrip6qxkfsaa", "email": "kufjgnkxkrhhfgbrip6qxkfsaa@example.com"}}
 {"type": "user", "user": {"username": "bwshaim6qnc2ne7oqkd5b2s2rq", "email": "bwshaim6qnc2ne7oqkd5b2s2rq@example.com", "teams": [{"name": "` + teamName + `", "channels": [{"name": "` + channelName + `"}]}]}}`
-	if err, line := BulkImport(strings.NewReader(data3), false, 2); err == nil || line != 1 {
+	if err, line := a.BulkImport(strings.NewReader(data3), false, 2); err == nil || line != 1 {
 		t.Fatalf("Should have failed due to missing version line on line 1.")
 	}
 }
 
 func TestImportProcessImportDataFileVersionLine(t *testing.T) {
-	_ = Setup()
+	a := Global()
+	_ = a.Setup()
 
 	data := LineImportData{
 		Type:    "version",