diff --git a/server/__test__/resolvers_test.go b/server/__test__/resolvers_test.go
index 17f0846..2a25093 100644
--- a/server/__test__/resolvers_test.go
+++ b/server/__test__/resolvers_test.go
@@ -1,6 +1,7 @@
 package test
 
 import (
+	"log"
 	"testing"
 
 	"github.com/authorizerdev/authorizer/server/constants"
@@ -20,11 +21,19 @@ func TestResolvers(t *testing.T) {
 		constants.EnvData.DATABASE_URL = dbURL
 		constants.EnvData.DATABASE_TYPE = dbType
 		db.InitDB()
+
+		// clean the persisted config for test to use fresh config
+		config, err := db.Mgr.GetConfig()
+		if err == nil {
+			config.Config = []byte{}
+			db.Mgr.UpdateConfig(config)
+		}
 		env.PersistEnv()
 
 		s := testSetup()
 		defer s.Server.Close()
 
+		log.Println("EnvData:", constants.EnvData)
 		t.Run("should pass tests for "+dbType, func(t *testing.T) {
 			loginTests(s, t)
 			signupTests(s, t)
diff --git a/server/email/email.go b/server/email/email.go
index 0ae2baa..843bf0f 100644
--- a/server/email/email.go
+++ b/server/email/email.go
@@ -17,7 +17,7 @@ func SendMail(to []string, Subject, bodyMessage string) error {
 	m.SetBody("text/html", bodyMessage)
 	port, _ := strconv.Atoi(constants.EnvData.SMTP_PORT)
 	d := gomail.NewDialer(constants.EnvData.SMTP_HOST, port, constants.EnvData.SMTP_USERNAME, constants.EnvData.SMTP_PASSWORD)
-	if constants.ENV == "development" {
+	if constants.EnvData.ENV == "development" {
 		d.TLSConfig = &tls.Config{InsecureSkipVerify: true}
 	}
 	if err := d.DialAndSend(m); err != nil {