From e2cc0df2e83d5fd8cf6a23191dc9ffb7c20ca9b0 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 19 Jun 2017 09:08:52 -0700
Subject: PLT-6761 fixing unit tests (#6671)

---
 store/sql_channel_store_test.go    | 128 ++++++++++++++---------------
 store/sql_compliance_store_test.go |  12 +--
 store/sql_post_store_test.go       | 162 ++++++++++++++++++-------------------
 store/sql_team_store_test.go       |  10 +--
 store/sql_user_store_test.go       |   2 +-
 5 files changed, 157 insertions(+), 157 deletions(-)

(limited to 'store')

diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index fc98f3f4e..5059ddb7c 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -18,7 +18,7 @@ func TestChannelStoreSave(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = teamId
 	o1.DisplayName = "Name"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 
 	if err := (<-store.Channel().Save(&o1)).Err; err != nil {
@@ -35,7 +35,7 @@ func TestChannelStoreSave(t *testing.T) {
 	}
 
 	o1.Id = ""
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_DIRECT
 	if err := (<-store.Channel().Save(&o1)).Err; err == nil {
 		t.Fatal("Should not be able to save direct channel")
@@ -50,7 +50,7 @@ func TestChannelStoreSaveDirectChannel(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = teamId
 	o1.DisplayName = "Name"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_DIRECT
 
 	u1 := &model.User{}
@@ -106,7 +106,7 @@ func TestChannelStoreSaveDirectChannel(t *testing.T) {
 
 	// Attempt to save a non-direct channel
 	o1.Id = ""
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	if err := (<-store.Channel().SaveDirectChannel(&o1, &m1, &m2)).Err; err == nil {
 		t.Fatal("Should not be able to save non-direct channel")
@@ -147,14 +147,14 @@ func TestChannelStoreUpdate(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Name"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = o1.TeamId
 	o2.DisplayName = "Name"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
@@ -260,7 +260,7 @@ func TestChannelStoreGet(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Name"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
@@ -291,7 +291,7 @@ func TestChannelStoreGet(t *testing.T) {
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "Direct Name"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_DIRECT
 
 	m1 := model.ChannelMember{}
@@ -347,7 +347,7 @@ func TestChannelStoreGetForPost(t *testing.T) {
 	o1 := Must(store.Channel().Save(&model.Channel{
 		TeamId:      model.NewId(),
 		DisplayName: "Name",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	})).(*model.Channel)
 
@@ -370,7 +370,7 @@ func TestSqlChannelStoreRestore(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
@@ -398,28 +398,28 @@ func TestChannelStoreDelete(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = o1.TeamId
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
 	o3 := model.Channel{}
 	o3.TeamId = o1.TeamId
 	o3.DisplayName = "Channel3"
-	o3.Name = "a" + model.NewId() + "b"
+	o3.Name = "zz" + model.NewId() + "b"
 	o3.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o3))
 
 	o4 := model.Channel{}
 	o4.TeamId = o1.TeamId
 	o4.DisplayName = "Channel4"
-	o4.Name = "a" + model.NewId() + "b"
+	o4.Name = "zz" + model.NewId() + "b"
 	o4.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o4))
 
@@ -480,7 +480,7 @@ func TestChannelStoreGetByName(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Name"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
@@ -522,7 +522,7 @@ func TestChannelStoreGetDeletedByName(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Name"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	o1.DeleteAt = model.GetMillis()
 	Must(store.Channel().Save(&o1))
@@ -546,7 +546,7 @@ func TestChannelStoreGetDeleted(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	o1.DeleteAt = model.GetMillis()
 	Must(store.Channel().Save(&o1))
@@ -568,7 +568,7 @@ func TestChannelStoreGetDeleted(t *testing.T) {
 	o2 := model.Channel{}
 	o2.TeamId = o1.TeamId
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
@@ -585,7 +585,7 @@ func TestChannelStoreGetDeleted(t *testing.T) {
 	o3 := model.Channel{}
 	o3.TeamId = o1.TeamId
 	o3.DisplayName = "Channel3"
-	o3.Name = "a" + model.NewId() + "b"
+	o3.Name = "zz" + model.NewId() + "b"
 	o3.Type = model.CHANNEL_OPEN
 	o3.DeleteAt = model.GetMillis()
 	Must(store.Channel().Save(&o3))
@@ -628,7 +628,7 @@ func TestChannelMemberStore(t *testing.T) {
 	c1 := model.Channel{}
 	c1.TeamId = model.NewId()
 	c1.DisplayName = "NameName"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = *Must(store.Channel().Save(&c1)).(*model.Channel)
 
@@ -725,7 +725,7 @@ func TestChannelDeleteMemberStore(t *testing.T) {
 	c1 := model.Channel{}
 	c1.TeamId = model.NewId()
 	c1.DisplayName = "NameName"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = *Must(store.Channel().Save(&c1)).(*model.Channel)
 
@@ -791,14 +791,14 @@ func TestChannelStoreGetChannels(t *testing.T) {
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
@@ -870,14 +870,14 @@ func TestChannelStoreGetMoreChannels(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
@@ -902,21 +902,21 @@ func TestChannelStoreGetMoreChannels(t *testing.T) {
 	o3 := model.Channel{}
 	o3.TeamId = o1.TeamId
 	o3.DisplayName = "ChannelA"
-	o3.Name = "a" + model.NewId() + "b"
+	o3.Name = "zz" + model.NewId() + "b"
 	o3.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o3))
 
 	o4 := model.Channel{}
 	o4.TeamId = o1.TeamId
 	o4.DisplayName = "ChannelB"
-	o4.Name = "a" + model.NewId() + "b"
+	o4.Name = "zz" + model.NewId() + "b"
 	o4.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&o4))
 
 	o5 := model.Channel{}
 	o5.TeamId = o1.TeamId
 	o5.DisplayName = "ChannelC"
-	o5.Name = "a" + model.NewId() + "b"
+	o5.Name = "zz" + model.NewId() + "b"
 	o5.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&o5))
 
@@ -937,7 +937,7 @@ func TestChannelStoreGetMoreChannels(t *testing.T) {
 	o6 := model.Channel{}
 	o6.TeamId = o1.TeamId
 	o6.DisplayName = "ChannelA"
-	o6.Name = "a" + model.NewId() + "b"
+	o6.Name = "zz" + model.NewId() + "b"
 	o6.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o6))
 
@@ -987,21 +987,21 @@ func TestChannelStoreGetPublicChannelsForTeam(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "OpenChannel1Team1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "OpenChannel1Team2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
 	o3 := model.Channel{}
 	o3.TeamId = o1.TeamId
 	o3.DisplayName = "PrivateChannel1Team1"
-	o3.Name = "a" + model.NewId() + "b"
+	o3.Name = "zz" + model.NewId() + "b"
 	o3.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&o3))
 
@@ -1022,7 +1022,7 @@ func TestChannelStoreGetPublicChannelsForTeam(t *testing.T) {
 	o4 := model.Channel{}
 	o4.TeamId = o1.TeamId
 	o4.DisplayName = "OpenChannel2Team1"
-	o4.Name = "a" + model.NewId() + "b"
+	o4.Name = "zz" + model.NewId() + "b"
 	o4.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o4))
 
@@ -1074,21 +1074,21 @@ func TestChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T) {
 	oc1 := model.Channel{}
 	oc1.TeamId = teamId1
 	oc1.DisplayName = "OpenChannel1Team1"
-	oc1.Name = "a" + model.NewId() + "b"
+	oc1.Name = "zz" + model.NewId() + "b"
 	oc1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&oc1))
 
 	oc2 := model.Channel{}
 	oc2.TeamId = model.NewId()
 	oc2.DisplayName = "OpenChannel2TeamOther"
-	oc2.Name = "a" + model.NewId() + "b"
+	oc2.Name = "zz" + model.NewId() + "b"
 	oc2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&oc2))
 
 	pc3 := model.Channel{}
 	pc3.TeamId = teamId1
 	pc3.DisplayName = "PrivateChannel3Team1"
-	pc3.Name = "a" + model.NewId() + "b"
+	pc3.Name = "zz" + model.NewId() + "b"
 	pc3.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&pc3))
 
@@ -1117,7 +1117,7 @@ func TestChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T) {
 	oc4 := model.Channel{}
 	oc4.TeamId = teamId1
 	oc4.DisplayName = "OpenChannel4Team1"
-	oc4.Name = "a" + model.NewId() + "b"
+	oc4.Name = "zz" + model.NewId() + "b"
 	oc4.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&oc4))
 
@@ -1153,14 +1153,14 @@ func TestChannelStoreGetChannelCounts(t *testing.T) {
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
@@ -1207,14 +1207,14 @@ func TestChannelStoreGetMembersForUser(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = t1.Id
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = o1.TeamId
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
@@ -1245,7 +1245,7 @@ func TestChannelStoreUpdateLastViewedAt(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	o1.TotalMsgCount = 25
 	Must(store.Channel().Save(&o1))
@@ -1273,7 +1273,7 @@ func TestChannelStoreIncrementMentionCount(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "Channel1"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	o1.TotalMsgCount = 25
 	Must(store.Channel().Save(&o1))
@@ -1422,7 +1422,7 @@ func TestChannelStoreGetMemberForPost(t *testing.T) {
 	o1 := Must(store.Channel().Save(&model.Channel{
 		TeamId:      model.NewId(),
 		DisplayName: "Name",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	})).(*model.Channel)
 
@@ -1457,7 +1457,7 @@ func TestGetMemberCount(t *testing.T) {
 	c1 := model.Channel{
 		TeamId:      teamId,
 		DisplayName: "Channel1",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	}
 	Must(store.Channel().Save(&c1))
@@ -1465,7 +1465,7 @@ func TestGetMemberCount(t *testing.T) {
 	c2 := model.Channel{
 		TeamId:      teamId,
 		DisplayName: "Channel2",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	}
 	Must(store.Channel().Save(&c2))
@@ -1561,7 +1561,7 @@ func TestUpdateExtrasByUser(t *testing.T) {
 	c1 := model.Channel{
 		TeamId:      teamId,
 		DisplayName: "Channel1",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	}
 	Must(store.Channel().Save(&c1))
@@ -1569,7 +1569,7 @@ func TestUpdateExtrasByUser(t *testing.T) {
 	c2 := model.Channel{
 		TeamId:      teamId,
 		DisplayName: "Channel2",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	}
 	Must(store.Channel().Save(&c2))
@@ -1609,14 +1609,14 @@ func TestChannelStoreSearchMore(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "ChannelA"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
@@ -1641,21 +1641,21 @@ func TestChannelStoreSearchMore(t *testing.T) {
 	o3 := model.Channel{}
 	o3.TeamId = o1.TeamId
 	o3.DisplayName = "ChannelA"
-	o3.Name = "a" + model.NewId() + "b"
+	o3.Name = "zz" + model.NewId() + "b"
 	o3.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o3))
 
 	o4 := model.Channel{}
 	o4.TeamId = o1.TeamId
 	o4.DisplayName = "ChannelB"
-	o4.Name = "a" + model.NewId() + "b"
+	o4.Name = "zz" + model.NewId() + "b"
 	o4.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&o4))
 
 	o5 := model.Channel{}
 	o5.TeamId = o1.TeamId
 	o5.DisplayName = "ChannelC"
-	o5.Name = "a" + model.NewId() + "b"
+	o5.Name = "zz" + model.NewId() + "b"
 	o5.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&o5))
 
@@ -1702,14 +1702,14 @@ func TestChannelStoreSearchInTeam(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "ChannelA"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
@@ -1734,21 +1734,21 @@ func TestChannelStoreSearchInTeam(t *testing.T) {
 	o3 := model.Channel{}
 	o3.TeamId = o1.TeamId
 	o3.DisplayName = "ChannelA"
-	o3.Name = "a" + model.NewId() + "b"
+	o3.Name = "zz" + model.NewId() + "b"
 	o3.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o3))
 
 	o4 := model.Channel{}
 	o4.TeamId = o1.TeamId
 	o4.DisplayName = "ChannelB"
-	o4.Name = "a" + model.NewId() + "b"
+	o4.Name = "zz" + model.NewId() + "b"
 	o4.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&o4))
 
 	o5 := model.Channel{}
 	o5.TeamId = o1.TeamId
 	o5.DisplayName = "ChannelC"
-	o5.Name = "a" + model.NewId() + "b"
+	o5.Name = "zz" + model.NewId() + "b"
 	o5.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&o5))
 
@@ -1786,7 +1786,7 @@ func TestChannelStoreGetMembersByIds(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "ChannelA"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
@@ -1831,21 +1831,21 @@ func TestChannelStoreAnalyticsDeletedTypeCount(t *testing.T) {
 	o1 := model.Channel{}
 	o1.TeamId = model.NewId()
 	o1.DisplayName = "ChannelA"
-	o1.Name = "a" + model.NewId() + "b"
+	o1.Name = "zz" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o1))
 
 	o2 := model.Channel{}
 	o2.TeamId = model.NewId()
 	o2.DisplayName = "Channel2"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Type = model.CHANNEL_OPEN
 	Must(store.Channel().Save(&o2))
 
 	p3 := model.Channel{}
 	p3.TeamId = model.NewId()
 	p3.DisplayName = "Channel3"
-	p3.Name = "a" + model.NewId() + "b"
+	p3.Name = "zz" + model.NewId() + "b"
 	p3.Type = model.CHANNEL_PRIVATE
 	Must(store.Channel().Save(&p3))
 
@@ -1923,7 +1923,7 @@ func TestChannelStoreGetPinnedPosts(t *testing.T) {
 	o1 := Must(store.Channel().Save(&model.Channel{
 		TeamId:      model.NewId(),
 		DisplayName: "Name",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	})).(*model.Channel)
 
@@ -1943,7 +1943,7 @@ func TestChannelStoreGetPinnedPosts(t *testing.T) {
 	o2 := Must(store.Channel().Save(&model.Channel{
 		TeamId:      model.NewId(),
 		DisplayName: "Name",
-		Name:        "a" + model.NewId() + "b",
+		Name:        "zz" + model.NewId() + "b",
 		Type:        model.CHANNEL_OPEN,
 	})).(*model.Channel)
 
diff --git a/store/sql_compliance_store_test.go b/store/sql_compliance_store_test.go
index eac7dce3c..ea85a3330 100644
--- a/store/sql_compliance_store_test.go
+++ b/store/sql_compliance_store_test.go
@@ -68,7 +68,7 @@ func TestComplianceExport(t *testing.T) {
 
 	t1 := &model.Team{}
 	t1.DisplayName = "DisplayName"
-	t1.Name = "a" + model.NewId() + "b"
+	t1.Name = "zz" + model.NewId() + "b"
 	t1.Email = model.NewId() + "@nowhere.com"
 	t1.Type = model.TEAM_OPEN
 	t1 = Must(store.Team().Save(t1)).(*model.Team)
@@ -88,7 +88,7 @@ func TestComplianceExport(t *testing.T) {
 	c1 := &model.Channel{}
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = Must(store.Channel().Save(c1)).(*model.Channel)
 
@@ -96,28 +96,28 @@ func TestComplianceExport(t *testing.T) {
 	o1.ChannelId = c1.Id
 	o1.UserId = u1.Id
 	o1.CreateAt = model.GetMillis()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = Must(store.Post().Save(o1)).(*model.Post)
 
 	o1a := &model.Post{}
 	o1a.ChannelId = c1.Id
 	o1a.UserId = u1.Id
 	o1a.CreateAt = o1.CreateAt + 10
-	o1a.Message = "a" + model.NewId() + "b"
+	o1a.Message = "zz" + model.NewId() + "b"
 	o1a = Must(store.Post().Save(o1a)).(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = c1.Id
 	o2.UserId = u1.Id
 	o2.CreateAt = o1.CreateAt + 20
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2 = Must(store.Post().Save(o2)).(*model.Post)
 
 	o2a := &model.Post{}
 	o2a.ChannelId = c1.Id
 	o2a.UserId = u2.Id
 	o2a.CreateAt = o1.CreateAt + 30
-	o2a.Message = "a" + model.NewId() + "b"
+	o2a.Message = "zz" + model.NewId() + "b"
 	o2a = Must(store.Post().Save(o2a)).(*model.Post)
 
 	time.Sleep(100 * time.Millisecond)
diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go
index f8fd653af..00d4185b4 100644
--- a/store/sql_post_store_test.go
+++ b/store/sql_post_store_test.go
@@ -19,7 +19,7 @@ func TestPostStoreSave(t *testing.T) {
 	o1 := model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 
 	if err := (<-store.Post().Save(&o1)).Err; err != nil {
 		t.Fatal("couldn't save item", err)
@@ -36,7 +36,7 @@ func TestPostStoreGet(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 
 	etag1 := (<-store.Post().GetEtag(o1.ChannelId, false)).Data.(string)
 	if strings.Index(etag1, model.CurrentVersion+".") != 0 {
@@ -73,7 +73,7 @@ func TestPostStoreGetSingle(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
@@ -95,7 +95,7 @@ func TestGetEtagCache(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 
 	etag1 := (<-store.Post().GetEtag(o1.ChannelId, true)).Data.(string)
 	if strings.Index(etag1, model.CurrentVersion+".") != 0 {
@@ -131,13 +131,13 @@ func TestPostStoreUpdate(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "AAAAAAAAAAA"
+	o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "CCCCCCCCC"
+	o2.Message = "zz" + model.NewId() + "CCCCCCCCC"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -145,7 +145,7 @@ func TestPostStoreUpdate(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "QQQQQQQQQQ"
+	o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 
 	ro1 := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o1.Id]
@@ -225,7 +225,7 @@ func TestPostStoreDelete(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 
 	etag1 := (<-store.Post().GetEtag(o1.ChannelId, false)).Data.(string)
 	if strings.Index(etag1, model.CurrentVersion+".") != 0 {
@@ -263,13 +263,13 @@ func TestPostStoreDelete1Level(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -293,13 +293,13 @@ func TestPostStoreDelete2Level(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -307,7 +307,7 @@ func TestPostStoreDelete2Level(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.ParentId = o2.Id
 	o3.RootId = o1.Id
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
@@ -315,7 +315,7 @@ func TestPostStoreDelete2Level(t *testing.T) {
 	o4 := &model.Post{}
 	o4.ChannelId = model.NewId()
 	o4.UserId = model.NewId()
-	o4.Message = "a" + model.NewId() + "b"
+	o4.Message = "zz" + model.NewId() + "b"
 	o4 = (<-store.Post().Save(o4)).Data.(*model.Post)
 
 	if r2 := <-store.Post().Delete(o1.Id, model.GetMillis()); r2.Err != nil {
@@ -345,13 +345,13 @@ func TestPostStorePermDelete1Level(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -359,7 +359,7 @@ func TestPostStorePermDelete1Level(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = model.NewId()
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 
 	if r2 := <-store.Post().PermanentDeleteByUser(o2.UserId); r2.Err != nil {
@@ -389,13 +389,13 @@ func TestPostStorePermDelete1Level2(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -403,7 +403,7 @@ func TestPostStorePermDelete1Level2(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = model.NewId()
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 
 	if r2 := <-store.Post().PermanentDeleteByUser(o1.UserId); r2.Err != nil {
@@ -429,13 +429,13 @@ func TestPostStoreGetWithChildren(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -443,7 +443,7 @@ func TestPostStoreGetWithChildren(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.ParentId = o2.Id
 	o3.RootId = o1.Id
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
@@ -486,14 +486,14 @@ func TestPostStoreGetPostsWtihDetails(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -502,7 +502,7 @@ func TestPostStoreGetPostsWtihDetails(t *testing.T) {
 	o2a := &model.Post{}
 	o2a.ChannelId = o1.ChannelId
 	o2a.UserId = model.NewId()
-	o2a.Message = "a" + model.NewId() + "b"
+	o2a.Message = "zz" + model.NewId() + "b"
 	o2a.ParentId = o1.Id
 	o2a.RootId = o1.Id
 	o2a = (<-store.Post().Save(o2a)).Data.(*model.Post)
@@ -511,7 +511,7 @@ func TestPostStoreGetPostsWtihDetails(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.ParentId = o1.Id
 	o3.RootId = o1.Id
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
@@ -520,14 +520,14 @@ func TestPostStoreGetPostsWtihDetails(t *testing.T) {
 	o4 := &model.Post{}
 	o4.ChannelId = o1.ChannelId
 	o4.UserId = model.NewId()
-	o4.Message = "a" + model.NewId() + "b"
+	o4.Message = "zz" + model.NewId() + "b"
 	o4 = (<-store.Post().Save(o4)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o5 := &model.Post{}
 	o5.ChannelId = o1.ChannelId
 	o5.UserId = model.NewId()
-	o5.Message = "a" + model.NewId() + "b"
+	o5.Message = "zz" + model.NewId() + "b"
 	o5.ParentId = o4.Id
 	o5.RootId = o4.Id
 	o5 = (<-store.Post().Save(o5)).Data.(*model.Post)
@@ -590,21 +590,21 @@ func TestPostStoreGetPostsBeforeAfter(t *testing.T) {
 	o0 := &model.Post{}
 	o0.ChannelId = model.NewId()
 	o0.UserId = model.NewId()
-	o0.Message = "a" + model.NewId() + "b"
+	o0.Message = "zz" + model.NewId() + "b"
 	o0 = (<-store.Post().Save(o0)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -613,7 +613,7 @@ func TestPostStoreGetPostsBeforeAfter(t *testing.T) {
 	o2a := &model.Post{}
 	o2a.ChannelId = o1.ChannelId
 	o2a.UserId = model.NewId()
-	o2a.Message = "a" + model.NewId() + "b"
+	o2a.Message = "zz" + model.NewId() + "b"
 	o2a.ParentId = o1.Id
 	o2a.RootId = o1.Id
 	o2a = (<-store.Post().Save(o2a)).Data.(*model.Post)
@@ -622,7 +622,7 @@ func TestPostStoreGetPostsBeforeAfter(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.ParentId = o1.Id
 	o3.RootId = o1.Id
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
@@ -631,14 +631,14 @@ func TestPostStoreGetPostsBeforeAfter(t *testing.T) {
 	o4 := &model.Post{}
 	o4.ChannelId = o1.ChannelId
 	o4.UserId = model.NewId()
-	o4.Message = "a" + model.NewId() + "b"
+	o4.Message = "zz" + model.NewId() + "b"
 	o4 = (<-store.Post().Save(o4)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o5 := &model.Post{}
 	o5.ChannelId = o1.ChannelId
 	o5.UserId = model.NewId()
-	o5.Message = "a" + model.NewId() + "b"
+	o5.Message = "zz" + model.NewId() + "b"
 	o5.ParentId = o4.Id
 	o5.RootId = o4.Id
 	o5 = (<-store.Post().Save(o5)).Data.(*model.Post)
@@ -695,21 +695,21 @@ func TestPostStoreGetPostsSince(t *testing.T) {
 	o0 := &model.Post{}
 	o0.ChannelId = model.NewId()
 	o0.UserId = model.NewId()
-	o0.Message = "a" + model.NewId() + "b"
+	o0.Message = "zz" + model.NewId() + "b"
 	o0 = (<-store.Post().Save(o0)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -718,7 +718,7 @@ func TestPostStoreGetPostsSince(t *testing.T) {
 	o2a := &model.Post{}
 	o2a.ChannelId = o1.ChannelId
 	o2a.UserId = model.NewId()
-	o2a.Message = "a" + model.NewId() + "b"
+	o2a.Message = "zz" + model.NewId() + "b"
 	o2a.ParentId = o1.Id
 	o2a.RootId = o1.Id
 	o2a = (<-store.Post().Save(o2a)).Data.(*model.Post)
@@ -727,7 +727,7 @@ func TestPostStoreGetPostsSince(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.ParentId = o1.Id
 	o3.RootId = o1.Id
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
@@ -736,14 +736,14 @@ func TestPostStoreGetPostsSince(t *testing.T) {
 	o4 := &model.Post{}
 	o4.ChannelId = o1.ChannelId
 	o4.UserId = model.NewId()
-	o4.Message = "a" + model.NewId() + "b"
+	o4.Message = "zz" + model.NewId() + "b"
 	o4 = (<-store.Post().Save(o4)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o5 := &model.Post{}
 	o5.ChannelId = o1.ChannelId
 	o5.UserId = model.NewId()
-	o5.Message = "a" + model.NewId() + "b"
+	o5.Message = "zz" + model.NewId() + "b"
 	o5.ParentId = o4.Id
 	o5.RootId = o4.Id
 	o5 = (<-store.Post().Save(o5)).Data.(*model.Post)
@@ -790,7 +790,7 @@ func TestPostStoreSearch(t *testing.T) {
 	c1 := &model.Channel{}
 	c1.TeamId = teamId
 	c1.DisplayName = "Channel1"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = (<-store.Channel().Save(c1)).Data.(*model.Channel)
 
@@ -803,7 +803,7 @@ func TestPostStoreSearch(t *testing.T) {
 	c2 := &model.Channel{}
 	c2.TeamId = teamId
 	c2.DisplayName = "Channel1"
-	c2.Name = "a" + model.NewId() + "b"
+	c2.Name = "zz" + model.NewId() + "b"
 	c2.Type = model.CHANNEL_OPEN
 	c2 = (<-store.Channel().Save(c2)).Data.(*model.Channel)
 
@@ -916,7 +916,7 @@ func TestUserCountsWithPostsByDay(t *testing.T) {
 
 	t1 := &model.Team{}
 	t1.DisplayName = "DisplayName"
-	t1.Name = "a" + model.NewId() + "b"
+	t1.Name = "zz" + model.NewId() + "b"
 	t1.Email = model.NewId() + "@nowhere.com"
 	t1.Type = model.TEAM_OPEN
 	t1 = Must(store.Team().Save(t1)).(*model.Team)
@@ -924,7 +924,7 @@ func TestUserCountsWithPostsByDay(t *testing.T) {
 	c1 := &model.Channel{}
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = Must(store.Channel().Save(c1)).(*model.Channel)
 
@@ -932,28 +932,28 @@ func TestUserCountsWithPostsByDay(t *testing.T) {
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
 	o1.CreateAt = utils.MillisFromTime(utils.Yesterday())
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = Must(store.Post().Save(o1)).(*model.Post)
 
 	o1a := &model.Post{}
 	o1a.ChannelId = c1.Id
 	o1a.UserId = model.NewId()
 	o1a.CreateAt = o1.CreateAt
-	o1a.Message = "a" + model.NewId() + "b"
+	o1a.Message = "zz" + model.NewId() + "b"
 	o1a = Must(store.Post().Save(o1a)).(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = c1.Id
 	o2.UserId = model.NewId()
 	o2.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24)
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2 = Must(store.Post().Save(o2)).(*model.Post)
 
 	o2a := &model.Post{}
 	o2a.ChannelId = c1.Id
 	o2a.UserId = o2.UserId
 	o2a.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24)
-	o2a.Message = "a" + model.NewId() + "b"
+	o2a.Message = "zz" + model.NewId() + "b"
 	o2a = Must(store.Post().Save(o2a)).(*model.Post)
 
 	if r1 := <-store.Post().AnalyticsUserCountsWithPostsByDay(t1.Id); r1.Err != nil {
@@ -976,7 +976,7 @@ func TestPostCountsByDay(t *testing.T) {
 
 	t1 := &model.Team{}
 	t1.DisplayName = "DisplayName"
-	t1.Name = "a" + model.NewId() + "b"
+	t1.Name = "zz" + model.NewId() + "b"
 	t1.Email = model.NewId() + "@nowhere.com"
 	t1.Type = model.TEAM_OPEN
 	t1 = Must(store.Team().Save(t1)).(*model.Team)
@@ -984,7 +984,7 @@ func TestPostCountsByDay(t *testing.T) {
 	c1 := &model.Channel{}
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = Must(store.Channel().Save(c1)).(*model.Channel)
 
@@ -992,28 +992,28 @@ func TestPostCountsByDay(t *testing.T) {
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
 	o1.CreateAt = utils.MillisFromTime(utils.Yesterday())
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = Must(store.Post().Save(o1)).(*model.Post)
 
 	o1a := &model.Post{}
 	o1a.ChannelId = c1.Id
 	o1a.UserId = model.NewId()
 	o1a.CreateAt = o1.CreateAt
-	o1a.Message = "a" + model.NewId() + "b"
+	o1a.Message = "zz" + model.NewId() + "b"
 	o1a = Must(store.Post().Save(o1a)).(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = c1.Id
 	o2.UserId = model.NewId()
 	o2.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24 * 2)
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2 = Must(store.Post().Save(o2)).(*model.Post)
 
 	o2a := &model.Post{}
 	o2a.ChannelId = c1.Id
 	o2a.UserId = o2.UserId
 	o2a.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24 * 2)
-	o2a.Message = "a" + model.NewId() + "b"
+	o2a.Message = "zz" + model.NewId() + "b"
 	o2a = Must(store.Post().Save(o2a)).(*model.Post)
 
 	time.Sleep(1 * time.Second)
@@ -1047,28 +1047,28 @@ func TestPostStoreGetFlaggedPostsForTeam(t *testing.T) {
 	c1 := &model.Channel{}
 	c1.TeamId = model.NewId()
 	c1.DisplayName = "Channel1"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = Must(store.Channel().Save(c1)).(*model.Channel)
 
 	o1 := &model.Post{}
 	o1.ChannelId = c1.Id
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.DeleteAt = 1
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
@@ -1076,13 +1076,13 @@ func TestPostStoreGetFlaggedPostsForTeam(t *testing.T) {
 	o4 := &model.Post{}
 	o4.ChannelId = model.NewId()
 	o4.UserId = model.NewId()
-	o4.Message = "a" + model.NewId() + "b"
+	o4.Message = "zz" + model.NewId() + "b"
 	o4 = (<-store.Post().Save(o4)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	c2 := &model.Channel{}
 	c2.DisplayName = "DMChannel1"
-	c2.Name = "a" + model.NewId() + "b"
+	c2.Name = "zz" + model.NewId() + "b"
 	c2.Type = model.CHANNEL_DIRECT
 
 	m1 := &model.ChannelMember{}
@@ -1100,7 +1100,7 @@ func TestPostStoreGetFlaggedPostsForTeam(t *testing.T) {
 	o5 := &model.Post{}
 	o5.ChannelId = c2.Id
 	o5.UserId = m2.UserId
-	o5.Message = "a" + model.NewId() + "b"
+	o5.Message = "zz" + model.NewId() + "b"
 	o5 = (<-store.Post().Save(o5)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1224,21 +1224,21 @@ func TestPostStoreGetFlaggedPosts(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.DeleteAt = 1
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
@@ -1325,14 +1325,14 @@ func TestPostStoreGetFlaggedPostsForChannel(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1340,7 +1340,7 @@ func TestPostStoreGetFlaggedPostsForChannel(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = model.NewId()
 	o3.UserId = o1.ChannelId
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.DeleteAt = 1
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
@@ -1348,7 +1348,7 @@ func TestPostStoreGetFlaggedPostsForChannel(t *testing.T) {
 	o4 := &model.Post{}
 	o4.ChannelId = model.NewId()
 	o4.UserId = model.NewId()
-	o4.Message = "a" + model.NewId() + "b"
+	o4.Message = "zz" + model.NewId() + "b"
 	o4 = (<-store.Post().Save(o4)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
 
@@ -1421,14 +1421,14 @@ func TestPostStoreGetPostsCreatedAt(t *testing.T) {
 	o0 := &model.Post{}
 	o0.ChannelId = model.NewId()
 	o0.UserId = model.NewId()
-	o0.Message = "a" + model.NewId() + "b"
+	o0.Message = "zz" + model.NewId() + "b"
 	o0.CreateAt = createTime
 	o0 = (<-store.Post().Save(o0)).Data.(*model.Post)
 
 	o1 := &model.Post{}
 	o1.ChannelId = o0.Id
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "b"
+	o1.Message = "zz" + model.NewId() + "b"
 	o0.CreateAt = createTime
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
@@ -1436,7 +1436,7 @@ func TestPostStoreGetPostsCreatedAt(t *testing.T) {
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "b"
+	o2.Message = "zz" + model.NewId() + "b"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -1445,7 +1445,7 @@ func TestPostStoreGetPostsCreatedAt(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = model.NewId()
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "b"
+	o3.Message = "zz" + model.NewId() + "b"
 	o3.CreateAt = createTime
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 	time.Sleep(2 * time.Millisecond)
@@ -1463,13 +1463,13 @@ func TestPostStoreOverwrite(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "AAAAAAAAAAA"
+	o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "CCCCCCCCC"
+	o2.Message = "zz" + model.NewId() + "CCCCCCCCC"
 	o2.ParentId = o1.Id
 	o2.RootId = o1.Id
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
@@ -1477,7 +1477,7 @@ func TestPostStoreOverwrite(t *testing.T) {
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "QQQQQQQQQQ"
+	o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 
 	ro1 := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o1.Id]
@@ -1557,19 +1557,19 @@ func TestPostStoreGetPostsByIds(t *testing.T) {
 	o1 := &model.Post{}
 	o1.ChannelId = model.NewId()
 	o1.UserId = model.NewId()
-	o1.Message = "a" + model.NewId() + "AAAAAAAAAAA"
+	o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
 	o1 = (<-store.Post().Save(o1)).Data.(*model.Post)
 
 	o2 := &model.Post{}
 	o2.ChannelId = o1.ChannelId
 	o2.UserId = model.NewId()
-	o2.Message = "a" + model.NewId() + "CCCCCCCCC"
+	o2.Message = "zz" + model.NewId() + "CCCCCCCCC"
 	o2 = (<-store.Post().Save(o2)).Data.(*model.Post)
 
 	o3 := &model.Post{}
 	o3.ChannelId = o1.ChannelId
 	o3.UserId = model.NewId()
-	o3.Message = "a" + model.NewId() + "QQQQQQQQQQ"
+	o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
 	o3 = (<-store.Post().Save(o3)).Data.(*model.Post)
 
 	ro1 := (<-store.Post().Get(o1.Id)).Data.(*model.PostList).Posts[o1.Id]
diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go
index f49124b09..acf58253b 100644
--- a/store/sql_team_store_test.go
+++ b/store/sql_team_store_test.go
@@ -162,7 +162,7 @@ func TestTeamStoreSearchAll(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "ADisplayName" + model.NewId()
-	o1.Name = "a" + model.NewId() + "a"
+	o1.Name = "zz" + model.NewId() + "a"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 
@@ -216,7 +216,7 @@ func TestTeamStoreSearchOpen(t *testing.T) {
 
 	o1 := model.Team{}
 	o1.DisplayName = "ADisplayName" + model.NewId()
-	o1.Name = "a" + model.NewId() + "a"
+	o1.Name = "zz" + model.NewId() + "a"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 
@@ -297,7 +297,7 @@ func TestTeamStoreGetByIniviteId(t *testing.T) {
 
 	o2 := model.Team{}
 	o2.DisplayName = "DisplayName"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Email = model.NewId() + "@nowhere.com"
 	o2.Type = model.TEAM_OPEN
 
@@ -371,7 +371,7 @@ func TestAllTeamListing(t *testing.T) {
 
 	o2 := model.Team{}
 	o2.DisplayName = "DisplayName"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Email = model.NewId() + "@nowhere.com"
 	o2.Type = model.TEAM_OPEN
 	Must(store.Team().Save(&o2))
@@ -400,7 +400,7 @@ func TestDelete(t *testing.T) {
 
 	o2 := model.Team{}
 	o2.DisplayName = "DisplayName"
-	o2.Name = "a" + model.NewId() + "b"
+	o2.Name = "zz" + model.NewId() + "b"
 	o2.Email = model.NewId() + "@nowhere.com"
 	o2.Type = model.TEAM_OPEN
 	Must(store.Team().Save(&o2))
diff --git a/store/sql_user_store_test.go b/store/sql_user_store_test.go
index 66bafda4e..dc4cd684a 100644
--- a/store/sql_user_store_test.go
+++ b/store/sql_user_store_test.go
@@ -1501,7 +1501,7 @@ func TestUserStoreSearch(t *testing.T) {
 	c1 := model.Channel{}
 	c1.TeamId = tid
 	c1.DisplayName = "NameName"
-	c1.Name = "a" + model.NewId() + "b"
+	c1.Name = "zz" + model.NewId() + "b"
 	c1.Type = model.CHANNEL_OPEN
 	c1 = *Must(store.Channel().Save(&c1)).(*model.Channel)
 
-- 
cgit v1.2.3-1-g7c22