diff --git a/common/models.go b/common/models.go
index 4398ea0..a01c454 100644
--- a/common/models.go
+++ b/common/models.go
@@ -175,9 +175,3 @@ type File struct {
 	// File itself
 	FileData []byte `gorm:"column:FileData"`
 }
-
-// Credentials type (not for DB)
-type credentials struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
diff --git a/common/testdata.go b/common/testdata.go
index a7aae38..05809aa 100644
--- a/common/testdata.go
+++ b/common/testdata.go
@@ -14,15 +14,15 @@ var MsgOK = ResponseMsg{
 }
 
 // Users
-var strPassword0 = "xyz789"
-var strPasswordA = "abc123"
-var strPasswordB = "bcd234"
+var StrPassword0 = "xyz789"
+var StrPasswordA = "abc123"
+var StrPasswordB = "bcd234"
 
 // Hash passwords with bcrypt algorithm
 var bcryptCost = 10
-var pw0, _ = bcrypt.GenerateFromPassword([]byte(strPassword0), bcryptCost)
-var pwA, _ = bcrypt.GenerateFromPassword([]byte(strPasswordA), bcryptCost)
-var pwB, _ = bcrypt.GenerateFromPassword([]byte(strPasswordB), bcryptCost)
+var pw0, _ = bcrypt.GenerateFromPassword([]byte(StrPassword0), bcryptCost)
+var pwA, _ = bcrypt.GenerateFromPassword([]byte(StrPasswordA), bcryptCost)
+var pwB, _ = bcrypt.GenerateFromPassword([]byte(StrPasswordB), bcryptCost)
 
 var User0 = User{Username: "User_0", Password: string(pw0),
 	Role: "Admin", Mail: "User_0@example.com"}
@@ -33,14 +33,9 @@ var UserB = User{Username: "User_B", Password: string(pwB),
 
 // Credentials
 
-var CredAdmin = credentials{
+var AdminCredentials = Request{
 	Username: User0.Username,
-	Password: strPassword0,
-}
-
-var CredUser = credentials{
-	Username: UserA.Username,
-	Password: strPasswordA,
+	Password: StrPassword0,
 }
 
 // Simulators
diff --git a/routes/user/user_test.go b/routes/user/user_test.go
index 64293c5..5968631 100644
--- a/routes/user/user_test.go
+++ b/routes/user/user_test.go
@@ -22,8 +22,9 @@ func TestUserEndpoints(t *testing.T) {
 	api.Use(Authentication(true))
 	RegisterUserEndpoints(api.Group("/users"))
 
+	// authenticate
 	token, err := common.NewAuthenticateForTest(router,
-		"/api/authenticate", "POST", common.CredAdmin, 200)
+		"/api/authenticate", "POST", common.AdminCredentials, 200)
 	assert.NoError(t, err)
 
 	// test GET user/