diff --git a/pkg/db/db.go b/pkg/db/db.go
index 542e0cb6b..2efde5d19 100644
--- a/pkg/db/db.go
+++ b/pkg/db/db.go
@@ -211,3 +211,8 @@ func WipeEverything() error {
 
 	return nil
 }
+
+// NewSession creates a new xorm session
+func NewSession() *xorm.Session {
+	return x.NewSession()
+}
diff --git a/pkg/models/bulk_task_test.go b/pkg/models/bulk_task_test.go
index f8c9ce83d..7ead77c53 100644
--- a/pkg/models/bulk_task_test.go
+++ b/pkg/models/bulk_task_test.go
@@ -57,7 +57,7 @@ func TestBulkTask_Update(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
 
-			s := x.NewSession()
+			s := db.NewSession()
 
 			bt := &BulkTask{
 				IDs:   tt.fields.IDs,
diff --git a/pkg/models/label_task_test.go b/pkg/models/label_task_test.go
index 26166dcba..1a3adf7e1 100644
--- a/pkg/models/label_task_test.go
+++ b/pkg/models/label_task_test.go
@@ -91,7 +91,7 @@ func TestLabelTask_ReadAll(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			l := &LabelTask{
 				ID:       tt.fields.ID,
@@ -189,7 +189,7 @@ func TestLabelTask_Create(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
 
-			s := x.NewSession()
+			s := db.NewSession()
 
 			l := &LabelTask{
 				ID:       tt.fields.ID,
@@ -288,7 +288,7 @@ func TestLabelTask_Delete(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
 
-			s := x.NewSession()
+			s := db.NewSession()
 
 			l := &LabelTask{
 				ID:       tt.fields.ID,
diff --git a/pkg/models/label_test.go b/pkg/models/label_test.go
index 3452f98c8..64175f76e 100644
--- a/pkg/models/label_test.go
+++ b/pkg/models/label_test.go
@@ -133,7 +133,7 @@ func TestLabel_ReadAll(t *testing.T) {
 				Rights:      tt.fields.Rights,
 			}
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			gotLs, _, _, err := l.ReadAll(s, tt.args.a, tt.args.search, tt.args.page, 0)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Label.ReadAll() error = %v, wantErr %v", err, tt.wantErr)
@@ -251,7 +251,7 @@ func TestLabel_ReadOne(t *testing.T) {
 				Rights:      tt.fields.Rights,
 			}
 
-			s := x.NewSession()
+			s := db.NewSession()
 
 			allowed, _, _ := l.CanRead(s, tt.auth)
 			if !allowed && !tt.wantForbidden {
@@ -322,7 +322,7 @@ func TestLabel_Create(t *testing.T) {
 				CRUDable:    tt.fields.CRUDable,
 				Rights:      tt.fields.Rights,
 			}
-			s := x.NewSession()
+			s := db.NewSession()
 			allowed, _ := l.CanCreate(s, tt.args.a)
 			if !allowed && !tt.wantForbidden {
 				t.Errorf("Label.CanCreate() forbidden, want %v", tt.wantForbidden)
@@ -414,7 +414,7 @@ func TestLabel_Update(t *testing.T) {
 				CRUDable:    tt.fields.CRUDable,
 				Rights:      tt.fields.Rights,
 			}
-			s := x.NewSession()
+			s := db.NewSession()
 			allowed, _ := l.CanUpdate(s, tt.auth)
 			if !allowed && !tt.wantForbidden {
 				t.Errorf("Label.CanUpdate() forbidden, want %v", tt.wantForbidden)
@@ -500,7 +500,7 @@ func TestLabel_Delete(t *testing.T) {
 				CRUDable:    tt.fields.CRUDable,
 				Rights:      tt.fields.Rights,
 			}
-			s := x.NewSession()
+			s := db.NewSession()
 			allowed, _ := l.CanDelete(s, tt.auth)
 			if !allowed && !tt.wantForbidden {
 				t.Errorf("Label.CanDelete() forbidden, want %v", tt.wantForbidden)
diff --git a/pkg/models/list_duplicate_test.go b/pkg/models/list_duplicate_test.go
index c00b60e9f..cd379f821 100644
--- a/pkg/models/list_duplicate_test.go
+++ b/pkg/models/list_duplicate_test.go
@@ -29,7 +29,7 @@ func TestListDuplicate(t *testing.T) {
 
 	db.LoadAndAssertFixtures(t)
 	files.InitTestFileFixtures(t)
-	s := x.NewSession()
+	s := db.NewSession()
 
 	u := &user.User{
 		ID: 1,
diff --git a/pkg/models/list_team_test.go b/pkg/models/list_team_test.go
index 0b9543bc6..494f44145 100644
--- a/pkg/models/list_team_test.go
+++ b/pkg/models/list_team_test.go
@@ -37,7 +37,7 @@ func TestTeamList_ReadAll(t *testing.T) {
 			ListID: 3,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		teams, _, _, err := tl.ReadAll(s, u, "", 1, 50)
 		assert.NoError(t, err)
 		assert.Equal(t, reflect.TypeOf(teams).Kind(), reflect.Slice)
@@ -50,7 +50,7 @@ func TestTeamList_ReadAll(t *testing.T) {
 			ListID: 99999,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		_, _, _, err := tl.ReadAll(s, u, "", 1, 50)
 		assert.Error(t, err)
 		assert.True(t, IsErrListDoesNotExist(err))
@@ -63,7 +63,7 @@ func TestTeamList_ReadAll(t *testing.T) {
 			Right:  RightAdmin,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		_, _, _, err := tl.ReadAll(s, u, "", 1, 50)
 		assert.NoError(t, err)
 		_ = s.Close()
@@ -75,7 +75,7 @@ func TestTeamList_ReadAll(t *testing.T) {
 			Right:  RightAdmin,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		_, _, _, err := tl.ReadAll(s, u, "", 1, 50)
 		assert.Error(t, err)
 		assert.True(t, IsErrNeedToHaveListReadAccess(err))
@@ -87,7 +87,7 @@ func TestTeamList_Create(t *testing.T) {
 	u := &user.User{ID: 1}
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 1,
 			ListID: 1,
@@ -107,7 +107,7 @@ func TestTeamList_Create(t *testing.T) {
 	})
 	t.Run("team already has access", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 1,
 			ListID: 3,
@@ -120,7 +120,7 @@ func TestTeamList_Create(t *testing.T) {
 	})
 	t.Run("wrong rights", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 1,
 			ListID: 1,
@@ -133,7 +133,7 @@ func TestTeamList_Create(t *testing.T) {
 	})
 	t.Run("nonexistant team", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 9999,
 			ListID: 1,
@@ -145,7 +145,7 @@ func TestTeamList_Create(t *testing.T) {
 	})
 	t.Run("nonexistant list", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 1,
 			ListID: 9999,
@@ -160,7 +160,7 @@ func TestTeamList_Create(t *testing.T) {
 func TestTeamList_Delete(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 1,
 			ListID: 3,
@@ -176,7 +176,7 @@ func TestTeamList_Delete(t *testing.T) {
 	})
 	t.Run("nonexistant team", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 9999,
 			ListID: 1,
@@ -188,7 +188,7 @@ func TestTeamList_Delete(t *testing.T) {
 	})
 	t.Run("nonexistant list", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		tl := TeamList{
 			TeamID: 1,
 			ListID: 9999,
@@ -255,7 +255,7 @@ func TestTeamList_Update(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			tl := &TeamList{
 				ID:       tt.fields.ID,
diff --git a/pkg/models/list_test.go b/pkg/models/list_test.go
index 99118d021..40bac6055 100644
--- a/pkg/models/list_test.go
+++ b/pkg/models/list_test.go
@@ -35,7 +35,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 	t.Run("create", func(t *testing.T) {
 		t.Run("normal", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			list := List{
 				Title:       "test",
 				Description: "Lorem Ipsum",
@@ -54,7 +54,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 		})
 		t.Run("nonexistant namespace", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			list := List{
 				Title:       "test",
 				Description: "Lorem Ipsum",
@@ -67,7 +67,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 		})
 		t.Run("nonexistant owner", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			usr := &user.User{ID: 9482385}
 			list := List{
 				Title:       "test",
@@ -81,7 +81,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 		})
 		t.Run("existing identifier", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			list := List{
 				Title:       "test",
 				Description: "Lorem Ipsum",
@@ -95,7 +95,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 		})
 		t.Run("non ascii characters", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			list := List{
 				Title:       "приффки фсем",
 				Description: "Lorem Ipsum",
@@ -117,7 +117,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 	t.Run("update", func(t *testing.T) {
 		t.Run("normal", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			list := List{
 				ID:          1,
 				Title:       "test",
@@ -138,7 +138,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 		})
 		t.Run("nonexistant", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			list := List{
 				ID:    99999999,
 				Title: "test",
@@ -151,7 +151,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 		})
 		t.Run("existing identifier", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			list := List{
 				Title:       "test",
 				Description: "Lorem Ipsum",
@@ -168,7 +168,7 @@ func TestList_CreateOrUpdate(t *testing.T) {
 
 func TestList_Delete(t *testing.T) {
 	db.LoadAndAssertFixtures(t)
-	s := x.NewSession()
+	s := db.NewSession()
 	list := List{
 		ID: 1,
 	}
@@ -184,7 +184,7 @@ func TestList_Delete(t *testing.T) {
 func TestList_ReadAll(t *testing.T) {
 	t.Run("all in namespace", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		// Get all lists for our namespace
 		lists, err := GetListsByNamespaceID(s, 1, &user.User{})
 		assert.NoError(t, err)
@@ -193,7 +193,7 @@ func TestList_ReadAll(t *testing.T) {
 	})
 	t.Run("all lists for user", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		u := &user.User{ID: 1}
 		list := List{}
 		lists3, _, _, err := list.ReadAll(s, u, "", 1, 50)
@@ -206,7 +206,7 @@ func TestList_ReadAll(t *testing.T) {
 	})
 	t.Run("lists for nonexistant user", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		usr := &user.User{ID: 999999}
 		list := List{}
 		_, _, _, err := list.ReadAll(s, usr, "", 1, 50)
diff --git a/pkg/models/list_users_rights_test.go b/pkg/models/list_users_rights_test.go
index 20dcb4bc1..359e38c42 100644
--- a/pkg/models/list_users_rights_test.go
+++ b/pkg/models/list_users_rights_test.go
@@ -80,7 +80,7 @@ func TestListUser_CanDoSomething(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			lu := &ListUser{
 				ID:       tt.fields.ID,
diff --git a/pkg/models/list_users_test.go b/pkg/models/list_users_test.go
index 836ddf93f..48c9828cf 100644
--- a/pkg/models/list_users_test.go
+++ b/pkg/models/list_users_test.go
@@ -109,7 +109,7 @@ func TestListUser_Create(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			ul := &ListUser{
 				ID:       tt.fields.ID,
@@ -218,7 +218,7 @@ func TestListUser_ReadAll(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			ul := &ListUser{
 				ID:       tt.fields.ID,
@@ -300,7 +300,7 @@ func TestListUser_Update(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			lu := &ListUser{
 				ID:       tt.fields.ID,
@@ -382,7 +382,7 @@ func TestListUser_Delete(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			lu := &ListUser{
 				ID:       tt.fields.ID,
diff --git a/pkg/models/namespace_team_rights_test.go b/pkg/models/namespace_team_rights_test.go
index 6b04b3b59..6619337b7 100644
--- a/pkg/models/namespace_team_rights_test.go
+++ b/pkg/models/namespace_team_rights_test.go
@@ -80,7 +80,7 @@ func TestTeamNamespace_CanDoSomething(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			tn := &TeamNamespace{
 				ID:          tt.fields.ID,
diff --git a/pkg/models/namespace_team_test.go b/pkg/models/namespace_team_test.go
index f94b712ff..22fd64f4a 100644
--- a/pkg/models/namespace_team_test.go
+++ b/pkg/models/namespace_team_test.go
@@ -36,7 +36,7 @@ func TestTeamNamespace_ReadAll(t *testing.T) {
 			NamespaceID: 3,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		teams, _, _, err := tn.ReadAll(s, u, "", 1, 50)
 		assert.NoError(t, err)
 		assert.Equal(t, reflect.TypeOf(teams).Kind(), reflect.Slice)
@@ -49,7 +49,7 @@ func TestTeamNamespace_ReadAll(t *testing.T) {
 			NamespaceID: 9999,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		_, _, _, err := tn.ReadAll(s, u, "", 1, 50)
 		assert.Error(t, err)
 		assert.True(t, IsErrNamespaceDoesNotExist(err))
@@ -60,7 +60,7 @@ func TestTeamNamespace_ReadAll(t *testing.T) {
 			NamespaceID: 17,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		_, _, _, err := tn.ReadAll(s, u, "", 1, 50)
 		assert.Error(t, err)
 		assert.True(t, IsErrNeedToHaveNamespaceReadAccess(err))
@@ -78,7 +78,7 @@ func TestTeamNamespace_Create(t *testing.T) {
 			Right:       RightAdmin,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		allowed, _ := tn.CanCreate(s, u)
 		assert.True(t, allowed)
 		err := tn.Create(s, u)
@@ -100,7 +100,7 @@ func TestTeamNamespace_Create(t *testing.T) {
 			Right:       RightRead,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := tn.Create(s, u)
 		assert.Error(t, err)
 		assert.True(t, IsErrTeamAlreadyHasAccess(err))
@@ -113,7 +113,7 @@ func TestTeamNamespace_Create(t *testing.T) {
 			Right:       RightUnknown,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := tn.Create(s, u)
 		assert.Error(t, err)
 		assert.True(t, IsErrInvalidRight(err))
@@ -125,7 +125,7 @@ func TestTeamNamespace_Create(t *testing.T) {
 			NamespaceID: 1,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := tn.Create(s, u)
 		assert.Error(t, err)
 		assert.True(t, IsErrTeamDoesNotExist(err))
@@ -137,7 +137,7 @@ func TestTeamNamespace_Create(t *testing.T) {
 			NamespaceID: 9999,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := tn.Create(s, u)
 		assert.Error(t, err)
 		assert.True(t, IsErrNamespaceDoesNotExist(err))
@@ -154,7 +154,7 @@ func TestTeamNamespace_Delete(t *testing.T) {
 			NamespaceID: 9,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		allowed, _ := tn.CanDelete(s, u)
 		assert.True(t, allowed)
 		err := tn.Delete(s)
@@ -173,7 +173,7 @@ func TestTeamNamespace_Delete(t *testing.T) {
 			NamespaceID: 3,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := tn.Delete(s)
 		assert.Error(t, err)
 		assert.True(t, IsErrTeamDoesNotExist(err))
@@ -185,7 +185,7 @@ func TestTeamNamespace_Delete(t *testing.T) {
 			NamespaceID: 9999,
 		}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := tn.Delete(s)
 		assert.Error(t, err)
 		assert.True(t, IsErrTeamDoesNotHaveAccessToNamespace(err))
@@ -248,7 +248,7 @@ func TestTeamNamespace_Update(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			tl := &TeamNamespace{
 				ID:          tt.fields.ID,
diff --git a/pkg/models/namespace_test.go b/pkg/models/namespace_test.go
index a87ba5c38..5e0bc2138 100644
--- a/pkg/models/namespace_test.go
+++ b/pkg/models/namespace_test.go
@@ -36,7 +36,7 @@ func TestNamespace_Create(t *testing.T) {
 
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := dummynamespace.Create(s, user1)
 		assert.NoError(t, err)
 		err = s.Commit()
@@ -49,7 +49,7 @@ func TestNamespace_Create(t *testing.T) {
 	})
 	t.Run("no title", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		n2 := Namespace{}
 		err := n2.Create(s, user1)
 		assert.Error(t, err)
@@ -58,7 +58,7 @@ func TestNamespace_Create(t *testing.T) {
 	})
 	t.Run("nonexistant user", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		nUser := &user.User{ID: 9482385}
 		dnsp2 := dummynamespace
 		err := dnsp2.Create(s, nUser)
@@ -72,7 +72,7 @@ func TestNamespace_ReadOne(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		n := &Namespace{ID: 1}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := n.ReadOne(s)
 		assert.NoError(t, err)
 		assert.Equal(t, n.Title, "testnamespace")
@@ -81,7 +81,7 @@ func TestNamespace_ReadOne(t *testing.T) {
 	t.Run("nonexistant", func(t *testing.T) {
 		n := &Namespace{ID: 99999}
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		err := n.ReadOne(s)
 		assert.Error(t, err)
 		assert.True(t, IsErrNamespaceDoesNotExist(err))
@@ -92,7 +92,7 @@ func TestNamespace_ReadOne(t *testing.T) {
 func TestNamespace_Update(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		n := &Namespace{
 			ID:    1,
 			Title: "Lorem Ipsum",
@@ -109,7 +109,7 @@ func TestNamespace_Update(t *testing.T) {
 	})
 	t.Run("nonexisting", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		n := &Namespace{
 			ID:    99999,
 			Title: "Lorem Ipsum",
@@ -121,7 +121,7 @@ func TestNamespace_Update(t *testing.T) {
 	})
 	t.Run("nonexisting owner", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		n := &Namespace{
 			ID:    1,
 			Title: "Lorem Ipsum",
@@ -134,7 +134,7 @@ func TestNamespace_Update(t *testing.T) {
 	})
 	t.Run("no title", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		n := &Namespace{
 			ID: 1,
 		}
@@ -148,7 +148,7 @@ func TestNamespace_Update(t *testing.T) {
 func TestNamespace_Delete(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		n := &Namespace{
 			ID: 1,
 		}
@@ -163,7 +163,7 @@ func TestNamespace_Delete(t *testing.T) {
 	})
 	t.Run("nonexisting", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		n := &Namespace{
 			ID: 9999,
 		}
@@ -180,7 +180,7 @@ func TestNamespace_ReadAll(t *testing.T) {
 	user11 := &user.User{ID: 11}
 	user12 := &user.User{ID: 12}
 
-	s := x.NewSession()
+	s := db.NewSession()
 	defer s.Close()
 
 	t.Run("normal", func(t *testing.T) {
diff --git a/pkg/models/namespace_users_rights_test.go b/pkg/models/namespace_users_rights_test.go
index 9e8feaa56..e8211cfaa 100644
--- a/pkg/models/namespace_users_rights_test.go
+++ b/pkg/models/namespace_users_rights_test.go
@@ -80,7 +80,7 @@ func TestNamespaceUser_CanDoSomething(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			nu := &NamespaceUser{
diff --git a/pkg/models/namespace_users_test.go b/pkg/models/namespace_users_test.go
index 2010fe8df..a7382f5b3 100644
--- a/pkg/models/namespace_users_test.go
+++ b/pkg/models/namespace_users_test.go
@@ -109,7 +109,7 @@ func TestNamespaceUser_Create(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			un := &NamespaceUser{
 				ID:          tt.fields.ID,
@@ -216,7 +216,7 @@ func TestNamespaceUser_ReadAll(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			un := &NamespaceUser{
@@ -303,7 +303,7 @@ func TestNamespaceUser_Update(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			nu := &NamespaceUser{
 				ID:          tt.fields.ID,
@@ -384,7 +384,7 @@ func TestNamespaceUser_Delete(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 
 			nu := &NamespaceUser{
 				ID:          tt.fields.ID,
diff --git a/pkg/models/saved_filters_test.go b/pkg/models/saved_filters_test.go
index 47cdcfed5..23ca38a1f 100644
--- a/pkg/models/saved_filters_test.go
+++ b/pkg/models/saved_filters_test.go
@@ -45,7 +45,7 @@ func TestSavedFilter_getFilterIDFromListID(t *testing.T) {
 
 func TestSavedFilter_Create(t *testing.T) {
 	db.LoadAndAssertFixtures(t)
-	s := x.NewSession()
+	s := db.NewSession()
 	defer s.Close()
 
 	sf := &SavedFilter{
@@ -77,7 +77,7 @@ func TestSavedFilter_Create(t *testing.T) {
 func TestSavedFilter_ReadOne(t *testing.T) {
 	user1 := &user.User{ID: 1}
 	db.LoadAndAssertFixtures(t)
-	s := x.NewSession()
+	s := db.NewSession()
 	defer s.Close()
 
 	sf := &SavedFilter{
@@ -93,7 +93,7 @@ func TestSavedFilter_ReadOne(t *testing.T) {
 
 func TestSavedFilter_Update(t *testing.T) {
 	db.LoadAndAssertFixtures(t)
-	s := x.NewSession()
+	s := db.NewSession()
 	defer s.Close()
 
 	sf := &SavedFilter{
@@ -115,7 +115,7 @@ func TestSavedFilter_Update(t *testing.T) {
 
 func TestSavedFilter_Delete(t *testing.T) {
 	db.LoadAndAssertFixtures(t)
-	s := x.NewSession()
+	s := db.NewSession()
 	defer s.Close()
 
 	sf := &SavedFilter{
@@ -138,7 +138,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 	t.Run("create", func(t *testing.T) {
 		// Should always be true
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		can, err := (&SavedFilter{}).CanCreate(s, user1)
@@ -148,7 +148,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 	t.Run("read", func(t *testing.T) {
 		t.Run("owner", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -162,7 +162,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("not owner", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -175,7 +175,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("nonexisting", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -189,7 +189,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("link share", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -205,7 +205,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 	t.Run("update", func(t *testing.T) {
 		t.Run("owner", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -218,7 +218,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("not owner", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -231,7 +231,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("nonexisting", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -245,7 +245,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("link share", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -261,7 +261,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 	t.Run("delete", func(t *testing.T) {
 		t.Run("owner", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -273,7 +273,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("not owner", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -285,7 +285,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("nonexisting", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
@@ -299,7 +299,7 @@ func TestSavedFilter_Rights(t *testing.T) {
 		})
 		t.Run("link share", func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			sf := &SavedFilter{
diff --git a/pkg/models/task_collection_test.go b/pkg/models/task_collection_test.go
index c8e7b68ba..29c8fc7c7 100644
--- a/pkg/models/task_collection_test.go
+++ b/pkg/models/task_collection_test.go
@@ -986,7 +986,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			lt := &TaskCollection{
diff --git a/pkg/models/task_comments_test.go b/pkg/models/task_comments_test.go
index b994a88e1..0d8bc33f5 100644
--- a/pkg/models/task_comments_test.go
+++ b/pkg/models/task_comments_test.go
@@ -28,7 +28,7 @@ func TestTaskComment_Create(t *testing.T) {
 	u := &user.User{ID: 1}
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{
@@ -51,7 +51,7 @@ func TestTaskComment_Create(t *testing.T) {
 	})
 	t.Run("nonexisting task", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{
@@ -67,7 +67,7 @@ func TestTaskComment_Create(t *testing.T) {
 func TestTaskComment_Delete(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{ID: 1}
@@ -82,7 +82,7 @@ func TestTaskComment_Delete(t *testing.T) {
 	})
 	t.Run("nonexisting comment", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{ID: 9999}
@@ -95,7 +95,7 @@ func TestTaskComment_Delete(t *testing.T) {
 func TestTaskComment_Update(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{
@@ -114,7 +114,7 @@ func TestTaskComment_Update(t *testing.T) {
 	})
 	t.Run("nonexisting comment", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{
@@ -129,7 +129,7 @@ func TestTaskComment_Update(t *testing.T) {
 func TestTaskComment_ReadOne(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{ID: 1}
@@ -140,7 +140,7 @@ func TestTaskComment_ReadOne(t *testing.T) {
 	})
 	t.Run("nonexisting", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{ID: 9999}
@@ -153,7 +153,7 @@ func TestTaskComment_ReadOne(t *testing.T) {
 func TestTaskComment_ReadAll(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{TaskID: 1}
@@ -169,7 +169,7 @@ func TestTaskComment_ReadAll(t *testing.T) {
 	})
 	t.Run("no access to task", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tc := &TaskComment{TaskID: 14}
diff --git a/pkg/models/task_reminder.go b/pkg/models/task_reminder.go
index 6b18962d5..e0b9b3ca2 100644
--- a/pkg/models/task_reminder.go
+++ b/pkg/models/task_reminder.go
@@ -17,6 +17,7 @@
 package models
 
 import (
+	"code.vikunja.io/api/pkg/db"
 	"time"
 	"xorm.io/xorm"
 
@@ -107,7 +108,7 @@ func RegisterReminderCron() {
 
 	log.Debugf("[Task Reminder Cron] Timezone is %s", tz)
 
-	s := x.NewSession()
+	s := db.NewSession()
 
 	err := cron.Schedule("* * * * *", func() {
 		// By default, time.Now() includes nanoseconds which we don't save. That results in getting the wrong dates,
diff --git a/pkg/models/tasks_test.go b/pkg/models/tasks_test.go
index bab26ba34..e3ab6c6ae 100644
--- a/pkg/models/tasks_test.go
+++ b/pkg/models/tasks_test.go
@@ -36,7 +36,7 @@ func TestTask_Create(t *testing.T) {
 
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -68,7 +68,7 @@ func TestTask_Create(t *testing.T) {
 	})
 	t.Run("empty title", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -82,7 +82,7 @@ func TestTask_Create(t *testing.T) {
 	})
 	t.Run("nonexistant list", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -96,7 +96,7 @@ func TestTask_Create(t *testing.T) {
 	})
 	t.Run("noneixtant user", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		nUser := &user.User{ID: 99999999}
@@ -111,7 +111,7 @@ func TestTask_Create(t *testing.T) {
 	})
 	t.Run("full bucket", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -129,7 +129,7 @@ func TestTask_Create(t *testing.T) {
 func TestTask_Update(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -152,7 +152,7 @@ func TestTask_Update(t *testing.T) {
 	})
 	t.Run("nonexistant task", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -167,7 +167,7 @@ func TestTask_Update(t *testing.T) {
 	})
 	t.Run("full bucket", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -183,7 +183,7 @@ func TestTask_Update(t *testing.T) {
 	})
 	t.Run("full bucket but not changing the bucket", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -202,7 +202,7 @@ func TestTask_Update(t *testing.T) {
 func TestTask_Delete(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{
@@ -222,7 +222,7 @@ func TestTask_Delete(t *testing.T) {
 func TestUpdateDone(t *testing.T) {
 	t.Run("marking a task as done", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		oldTask := &Task{Done: false}
@@ -232,7 +232,7 @@ func TestUpdateDone(t *testing.T) {
 	})
 	t.Run("unmarking a task as done", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		oldTask := &Task{Done: true}
@@ -442,7 +442,7 @@ func TestUpdateDone(t *testing.T) {
 func TestTask_ReadOne(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{ID: 1}
@@ -452,7 +452,7 @@ func TestTask_ReadOne(t *testing.T) {
 	})
 	t.Run("nonexisting", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		task := &Task{ID: 99999}
diff --git a/pkg/models/team_members_test.go b/pkg/models/team_members_test.go
index 904d56110..b682577d3 100644
--- a/pkg/models/team_members_test.go
+++ b/pkg/models/team_members_test.go
@@ -32,7 +32,7 @@ func TestTeamMember_Create(t *testing.T) {
 
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tm := &TeamMember{
@@ -52,7 +52,7 @@ func TestTeamMember_Create(t *testing.T) {
 	})
 	t.Run("already existing", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tm := &TeamMember{
@@ -65,7 +65,7 @@ func TestTeamMember_Create(t *testing.T) {
 	})
 	t.Run("nonexisting user", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tm := &TeamMember{
@@ -78,7 +78,7 @@ func TestTeamMember_Create(t *testing.T) {
 	})
 	t.Run("nonexisting team", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tm := &TeamMember{
@@ -94,7 +94,7 @@ func TestTeamMember_Create(t *testing.T) {
 func TestTeamMember_Delete(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tm := &TeamMember{
@@ -116,7 +116,7 @@ func TestTeamMember_Delete(t *testing.T) {
 func TestTeamMember_Update(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tm := &TeamMember{
@@ -140,7 +140,7 @@ func TestTeamMember_Update(t *testing.T) {
 	// should ignore what was passed.
 	t.Run("explicitly false in payload", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		tm := &TeamMember{
diff --git a/pkg/models/teams_rights_test.go b/pkg/models/teams_rights_test.go
index 4e34afb5a..59d5ec025 100644
--- a/pkg/models/teams_rights_test.go
+++ b/pkg/models/teams_rights_test.go
@@ -82,7 +82,7 @@ func TestTeam_CanDoSomething(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			db.LoadAndAssertFixtures(t)
-			s := x.NewSession()
+			s := db.NewSession()
 			defer s.Close()
 
 			tm := &Team{
diff --git a/pkg/models/teams_test.go b/pkg/models/teams_test.go
index 27cb54cfd..00fa6d0d6 100644
--- a/pkg/models/teams_test.go
+++ b/pkg/models/teams_test.go
@@ -32,7 +32,7 @@ func TestTeam_Create(t *testing.T) {
 	}
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{
@@ -51,7 +51,7 @@ func TestTeam_Create(t *testing.T) {
 	})
 	t.Run("empty name", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{}
@@ -64,7 +64,7 @@ func TestTeam_Create(t *testing.T) {
 func TestTeam_ReadOne(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{ID: 1}
@@ -77,7 +77,7 @@ func TestTeam_ReadOne(t *testing.T) {
 	})
 	t.Run("invalid id", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{ID: -1}
@@ -87,7 +87,7 @@ func TestTeam_ReadOne(t *testing.T) {
 	})
 	t.Run("nonexisting", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{ID: 99999}
@@ -100,7 +100,7 @@ func TestTeam_ReadOne(t *testing.T) {
 func TestTeam_ReadAll(t *testing.T) {
 	doer := &user.User{ID: 1}
 	t.Run("normal", func(t *testing.T) {
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{}
@@ -115,7 +115,7 @@ func TestTeam_ReadAll(t *testing.T) {
 func TestTeam_Update(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{
@@ -133,7 +133,7 @@ func TestTeam_Update(t *testing.T) {
 	})
 	t.Run("empty name", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{
@@ -146,7 +146,7 @@ func TestTeam_Update(t *testing.T) {
 	})
 	t.Run("nonexisting", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{
@@ -162,7 +162,7 @@ func TestTeam_Update(t *testing.T) {
 func TestTeam_Delete(t *testing.T) {
 	t.Run("normal", func(t *testing.T) {
 		db.LoadAndAssertFixtures(t)
-		s := x.NewSession()
+		s := db.NewSession()
 		defer s.Close()
 
 		team := &Team{