diff --git a/server/test/verify_totp_test.go b/server/test/verify_totp_test.go
index 741f347..104a4b0 100644
--- a/server/test/verify_totp_test.go
+++ b/server/test/verify_totp_test.go
@@ -1,76 +1,81 @@
 package test
 
 import (
+	"github.com/authorizerdev/authorizer/server/db"
+	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/resolvers"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
 func verifyTOTPTest(t *testing.T, s TestSetup) {
-	//t.Helper()
-	//t.Run(`should verify totp`, func(t *testing.T) {
-	//	req, ctx := createContext(s)
-	//	email := "verify_otp." + s.TestInfo.Email
-	//	res, err := resolvers.SignupResolver(ctx, model.SignUpInput{
-	//		Email:           email,
-	//		Password:        s.TestInfo.Password,
-	//		ConfirmPassword: s.TestInfo.Password,
-	//	})
-	//	assert.NoError(t, err)
-	//	assert.NotNil(t, res)
-	//
-	//	// Login should fail as email is not verified
-	//	loginRes, err := resolvers.LoginResolver(ctx, model.LoginInput{
-	//		Email:    email,
-	//		Password: s.TestInfo.Password,
-	//	})
-	//	assert.Error(t, err)
-	//	assert.Nil(t, loginRes)
-	//	verificationRequest, err := db.Provider.GenerateTotp(ctx, loginRes.User.ID)
-	//	assert.Nil(t, err)
-	//	assert.Equal(t, email, verificationRequest.Email)
-	//	verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
-	//		Token: verificationRequest.Token,
-	//	})
-	//	assert.Nil(t, err)
-	//	assert.NotEqual(t, verifyRes.AccessToken, "", "access token should not be empty")
-	//
-	//	// Using access token update profile
-	//	s.GinContext.Request.Header.Set("Authorization", "Bearer "+refs.StringValue(verifyRes.AccessToken))
-	//	ctx = context.WithValue(req.Context(), "GinContextKey", s.GinContext)
-	//	updateProfileRes, err := resolvers.UpdateProfileResolver(ctx, model.UpdateProfileInput{
-	//		IsMultiFactorAuthEnabled: refs.NewBoolRef(true),
-	//	})
-	//	assert.NoError(t, err)
-	//	assert.NotEmpty(t, updateProfileRes.Message)
-	//
-	//	// Login should not return error but access token should be empty as otp should have been sent
-	//	loginRes, err = resolvers.LoginResolver(ctx, model.LoginInput{
-	//		Email:    email,
-	//		Password: s.TestInfo.Password,
-	//	})
-	//	assert.NoError(t, err)
-	//	assert.NotNil(t, loginRes)
-	//	assert.Nil(t, loginRes.AccessToken)
-	//
-	//	// Get otp from db
-	//	otp, err := db.Provider.GetOTPByEmail(ctx, email)
-	//	assert.NoError(t, err)
-	//	assert.NotEmpty(t, otp.Otp)
-	//	// Get user by email
-	//	user, err := db.Provider.GetUserByEmail(ctx, email)
-	//	assert.NoError(t, err)
-	//	assert.NotNil(t, user)
-	//	// Set mfa cookie session
-	//	mfaSession := uuid.NewString()
-	//	memorystore.Provider.SetMfaSession(user.ID, mfaSession, time.Now().Add(1*time.Minute).Unix())
-	//	cookie := fmt.Sprintf("%s=%s;", constants.MfaCookieName+"_session", mfaSession)
-	//	cookie = strings.TrimSuffix(cookie, ";")
-	//	req.Header.Set("Cookie", cookie)
-	//	verifyOtpRes, err := resolvers.VerifyOtpResolver(ctx, model.VerifyOTPRequest{
-	//		Email: &email,
-	//		Otp:   otp.Otp,
-	//	})
-	//	assert.Nil(t, err)
-	//	assert.NotEqual(t, verifyOtpRes.AccessToken, "", "access token should not be empty")
-	//	cleanData(email)
-	//})
+	t.Helper()
+	t.Run(`should verify totp`, func(t *testing.T) {
+		_, ctx := createContext(s)
+		email := "verify_otp." + s.TestInfo.Email
+		res, err := resolvers.SignupResolver(ctx, model.SignUpInput{
+			Email:           email,
+			Password:        s.TestInfo.Password,
+			ConfirmPassword: s.TestInfo.Password,
+		})
+		assert.NoError(t, err)
+		assert.NotNil(t, res)
+
+		// Login should fail as email is not verified
+		loginRes, err := resolvers.LoginResolver(ctx, model.LoginInput{
+			Email:    email,
+			Password: s.TestInfo.Password,
+		})
+		assert.Error(t, err)
+		assert.Nil(t, loginRes)
+		_, err = db.Provider.GenerateTotp(ctx, loginRes.User.ID)
+		assert.Nil(t, err)
+		//assert.Equal(t, ??, string)
+		//	verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
+		//		Token: verificationRequest.Token,
+		//	})
+		//	assert.Nil(t, err)
+		//	assert.NotEqual(t, verifyRes.AccessToken, "", "access token should not be empty")
+		//
+		//	// Using access token update profile
+		//	s.GinContext.Request.Header.Set("Authorization", "Bearer "+refs.StringValue(verifyRes.AccessToken))
+		//	ctx = context.WithValue(req.Context(), "GinContextKey", s.GinContext)
+		//	updateProfileRes, err := resolvers.UpdateProfileResolver(ctx, model.UpdateProfileInput{
+		//		IsMultiFactorAuthEnabled: refs.NewBoolRef(true),
+		//	})
+		//	assert.NoError(t, err)
+		//	assert.NotEmpty(t, updateProfileRes.Message)
+		//
+		//	// Login should not return error but access token should be empty as otp should have been sent
+		//	loginRes, err = resolvers.LoginResolver(ctx, model.LoginInput{
+		//		Email:    email,
+		//		Password: s.TestInfo.Password,
+		//	})
+		//	assert.NoError(t, err)
+		//	assert.NotNil(t, loginRes)
+		//	assert.Nil(t, loginRes.AccessToken)
+		//
+		//	// Get otp from db
+		//	otp, err := db.Provider.GetOTPByEmail(ctx, email)
+		//	assert.NoError(t, err)
+		//	assert.NotEmpty(t, otp.Otp)
+		//	// Get user by email
+		//	user, err := db.Provider.GetUserByEmail(ctx, email)
+		//	assert.NoError(t, err)
+		//	assert.NotNil(t, user)
+		//	// Set mfa cookie session
+		//	mfaSession := uuid.NewString()
+		//	memorystore.Provider.SetMfaSession(user.ID, mfaSession, time.Now().Add(1*time.Minute).Unix())
+		//	cookie := fmt.Sprintf("%s=%s;", constants.MfaCookieName+"_session", mfaSession)
+		//	cookie = strings.TrimSuffix(cookie, ";")
+		//	req.Header.Set("Cookie", cookie)
+		//	verifyOtpRes, err := resolvers.VerifyOtpResolver(ctx, model.VerifyOTPRequest{
+		//		Email: &email,
+		//		Otp:   otp.Otp,
+		//	})
+		//	assert.Nil(t, err)
+		//	assert.NotEqual(t, verifyOtpRes.AccessToken, "", "access token should not be empty")
+		//	cleanData(email)
+		//})
+	})
 }