diff --git a/api/account_test.go b/api/account_test.go
index fde5d77..7ae7581 100644
--- a/api/account_test.go
+++ b/api/account_test.go
@@ -45,13 +45,13 @@ func randomAccount() db.Account {
 	return db.Account{
 		ID:           util.RandomInt(1, 1000),
 		Passwordhash: util.RandomString(250),
-		Firstname:    util.RandomUser(),
-		Lastname:     util.RandomUser(),
+		Firstname:    util.RandomName(),
+		Lastname:     util.RandomName(),
 		Email:        util.RandomEmail(),
-		Zip:          util.RandomUser(),
-		Street:       util.RandomUser(),
-		City:         util.RandomUser(),
-		Country:      util.RandomUser(),
+		Zip:          util.RandomName(),
+		Street:       util.RandomName(),
+		City:         util.RandomName(),
+		Country:      util.RandomName(),
 	}
 }
 
diff --git a/api/main_test.go b/api/main_test.go
new file mode 100644
index 0000000..a6d9966
--- /dev/null
+++ b/api/main_test.go
@@ -0,0 +1,15 @@
+package api
+
+import (
+	"os"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestMain(m *testing.M) {
+
+	gin.SetMode(gin.TestMode)
+
+	os.Exit(m.Run())
+}
diff --git a/db/sqlc/account_test.go b/db/sqlc/account_test.go
index e5082ec..d7c0cdd 100644
--- a/db/sqlc/account_test.go
+++ b/db/sqlc/account_test.go
@@ -12,12 +12,12 @@ import (
 
 func createRandomAccount(t *testing.T) Account {
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreateAccountParams{
 		Passwordhash: util.RandomString(30),
-		Firstname:    util.RandomUser(),
-		Lastname:     util.RandomUser(),
+		Firstname:    util.RandomName(),
+		Lastname:     util.RandomName(),
 		Birthday:     time.Date(1990, 1, 1, 0, 0, 0, 0, time.UTC),
 		Email:        util.RandomEmail(),
 		Phone: sql.NullString{
diff --git a/db/sqlc/document_test.go b/db/sqlc/document_test.go
index f9eada2..c23b918 100644
--- a/db/sqlc/document_test.go
+++ b/db/sqlc/document_test.go
@@ -14,15 +14,15 @@ func createRandomDocumentUpload(t *testing.T) Document {
 	person := createRandomPerson(t)
 	require.NotEmpty(t, person)
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreateDocumentUploadParams{
 		PersonID: sql.NullInt64{
 			Valid: true,
 			Int64: person.ID,
 		},
-		Name:    util.RandomUser(),
-		Type:    util.RandomUser(),
+		Name:    util.RandomString(20),
+		Type:    util.RandomString(5),
 		Path:    util.RandomString(50),
 		Url:     util.RandomString(60),
 		Creator: creator,
@@ -59,12 +59,12 @@ func TestCreateDocumentMail(t *testing.T) {
 			Valid: true,
 			Int64: mail.ID,
 		},
-		Name:    util.RandomUser(),
-		Type:    util.RandomUser(),
+		Name:    util.RandomString(20),
+		Type:    util.RandomString(5),
 		Path:    util.RandomString(50),
 		Url:     util.RandomString(60),
-		Creator: util.RandomUser(),
-		Changer: util.RandomUser(),
+		Creator: util.RandomName(),
+		Changer: util.RandomName(),
 	}
 
 	document, err := testQueries.CreateDocumentMail(context.Background(), arg)
@@ -166,7 +166,7 @@ func TestListDocuments(t *testing.T) {
 func TestValidateDocument(t *testing.T) {
 	document1 := createRandomDocumentUpload(t)
 
-	validator := util.RandomUser()
+	validator := util.RandomName()
 
 	arg := ValidateDocumentParams{
 		ID: document1.ID,
@@ -191,7 +191,7 @@ func TestValidateDocument(t *testing.T) {
 func TestInvalidateDocument(t *testing.T) {
 	document1 := createRandomDocumentUpload(t)
 
-	validator := util.RandomUser()
+	validator := util.RandomName()
 
 	arg := ValidateDocumentParams{
 		ID: document1.ID,
@@ -205,7 +205,7 @@ func TestInvalidateDocument(t *testing.T) {
 	require.NoError(t, err)
 	require.NotEmpty(t, document2)
 
-	invalidator := util.RandomUser()
+	invalidator := util.RandomName()
 
 	arg2 := InvalidateDocumentParams{
 		ID:      document2.ID,
diff --git a/db/sqlc/mail_test.go b/db/sqlc/mail_test.go
index bd059da..ffb2672 100644
--- a/db/sqlc/mail_test.go
+++ b/db/sqlc/mail_test.go
@@ -12,7 +12,7 @@ import (
 
 func createRandomMail(t *testing.T) Mail {
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreateMailParams{
 		From:      util.RandomEmail(),
diff --git a/db/sqlc/payment_test.go b/db/sqlc/payment_test.go
index 129a39f..ec14caa 100644
--- a/db/sqlc/payment_test.go
+++ b/db/sqlc/payment_test.go
@@ -14,36 +14,36 @@ func createRandomPayment(t *testing.T) Payment {
 	account := createRandomAccount(t)
 	require.NotEmpty(t, account)
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreatePaymentParams{
 		AccountID:       account.ID,
-		PaymentCategory: util.RandomUser(),
+		PaymentCategory: util.RandomName(),
 		Bankname: sql.NullString{
 			Valid:  true,
-			String: util.RandomUser(),
+			String: util.RandomName(),
 		},
 		IBAN: sql.NullString{
 			Valid:  true,
-			String: util.RandomUser(),
+			String: util.RandomName(),
 		},
 		BIC: sql.NullString{
 			Valid:  true,
-			String: util.RandomUser(),
+			String: util.RandomName(),
 		},
 		PaypalAccount: sql.NullString{
 			Valid:  true,
-			String: util.RandomUser(),
+			String: util.RandomName(),
 		},
 		PaypalID: sql.NullString{
 			Valid:  true,
-			String: util.RandomUser(),
+			String: util.RandomName(),
 		},
 		PaymentSystem: sql.NullString{
 			Valid:  true,
-			String: util.RandomUser(),
+			String: util.RandomName(),
 		},
-		Type:    util.RandomUser(),
+		Type:    util.RandomName(),
 		Creator: creator,
 		Changer: creator,
 	}
@@ -113,7 +113,7 @@ func TestUpdatePayment(t *testing.T) {
 	arg := UpdatePaymentParams{
 		ID: person1.ID,
 		Bankname: sql.NullString{
-			String: util.RandomUser(),
+			String: util.RandomName(),
 			Valid:  true,
 		},
 	}
diff --git a/db/sqlc/person_test.go b/db/sqlc/person_test.go
index 6cd48b6..2316764 100644
--- a/db/sqlc/person_test.go
+++ b/db/sqlc/person_test.go
@@ -14,12 +14,12 @@ func createRandomPerson(t *testing.T) Person {
 	account := createRandomAccount(t)
 	require.NotEmpty(t, account)
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreatePersonParams{
 		AccountID: account.ID,
-		Firstname: util.RandomUser(),
-		Lastname:  util.RandomUser(),
+		Firstname: util.RandomName(),
+		Lastname:  util.RandomName(),
 		Birthday:  time.Date(1990, 1, 1, 0, 0, 0, 0, time.UTC),
 		City:      util.RandomString(15),
 		Zip:       util.RandomString(5),
diff --git a/db/sqlc/provider_test.go b/db/sqlc/provider_test.go
index 01b9280..b6063e6 100644
--- a/db/sqlc/provider_test.go
+++ b/db/sqlc/provider_test.go
@@ -12,13 +12,13 @@ import (
 
 func createRandomProvider(t *testing.T) Provider {
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreateProviderParams{
-		Name:        util.RandomUser(),
+		Name:        util.RandomName(),
 		Description: util.RandomString(30),
-		Category:    util.RandomUser(),
-		Email:       util.RandomUser(),
+		Category:    util.RandomName(),
+		Email:       util.RandomName(),
 		Creator:     creator,
 		Changer:     creator,
 	}
diff --git a/db/sqlc/return_test.go b/db/sqlc/return_test.go
index 391724d..19e47fb 100644
--- a/db/sqlc/return_test.go
+++ b/db/sqlc/return_test.go
@@ -15,16 +15,16 @@ func createRandomReturn(t *testing.T) Return {
 	person := createRandomPerson(t)
 	provider := createRandomProvider(t)
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreateReturnParams{
 		Personid:    person.ID,
 		Providerid:  provider.ID,
 		Status:      util.RandomString(7),
-		Name:        util.RandomUser(),
+		Name:        util.RandomName(),
 		Description: util.RandomString(30),
-		Category:    util.RandomUser(),
-		Email:       util.RandomUser(),
+		Category:    util.RandomName(),
+		Email:       util.RandomName(),
 		Creator:     creator,
 		Changer:     creator,
 	}
diff --git a/db/sqlc/returnsLog_test.go b/db/sqlc/returnsLog_test.go
index c11f6a3..62fe6d6 100644
--- a/db/sqlc/returnsLog_test.go
+++ b/db/sqlc/returnsLog_test.go
@@ -15,7 +15,7 @@ func createRandomReturnsLog(t *testing.T) ReturnsLog {
 	ret := createRandomReturn(t)
 	mail := createRandomMail(t)
 
-	creator := util.RandomUser()
+	creator := util.RandomName()
 
 	arg := CreateReturnsLogParams{
 		Returnid: ret.ID,
diff --git a/util/random.go b/util/random.go
index ad70553..105e238 100644
--- a/util/random.go
+++ b/util/random.go
@@ -8,10 +8,6 @@ import (
 const alphabet = "abcdefghijklmnopqrstuvwxyz"
 const numbers = "0123456789"
 
-// func init() {
-// 	rand.Seed(time.Now().UnixNano())
-// }
-
 // RandomInt generates a random number between min and max
 func RandomInt(min, max int64) int64 {
 	return min + rand.Int63n(max-min+1)
@@ -43,9 +39,10 @@ func RandomPhone() string {
 	return sb.String()
 }
 
-// RandomUser generates a random username
-func RandomUser() string {
-	return RandomString(20)
+// RandomName generates a random name
+func RandomName() string {
+	n := RandomInt(3, 12)
+	return RandomString(int(n))
 }
 
 // RandomEmail generates a random email address