diff --git a/.gitignore b/.gitignore
index 01edfbe..4e1497c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ build/
 shortener_db_schema.sql
 /out/
 /logs/
+/test-output/
diff --git a/Dockerfile b/Dockerfile
index 9924105..bd039cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1
+#syntax=docker/dockerfile:1
 
 # Add the following lines to tag the image (replace 'your_username' and 'shortener-app' with your Docker Hub username and repository name)
 ARG VERSION=latest
diff --git a/docker-compose.yml b/docker-compose.yml
index df8265f..fffb898 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,7 @@
 version: '3.8'
 
 volumes:
-  dbdata:
-    name: dbdata
+  data:
 
 services:
   db:
@@ -14,9 +13,6 @@ services:
       MYSQL_PASSWORD: 1234qwer
     volumes:
       - data:/var/lib/mysql
-      - type: volume
-        source: dbdata
-        target: /var/lib/mysql
       - ./create.sql:/docker-entrypoint-initdb.d/init.sql
     ports:
       - "3306:3306"
@@ -33,7 +29,7 @@ services:
   #    dockerfile: Dockerfile
 
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8080/monitoring" ]
+      test: [ "CMD-SHELL", "curl", "-f", "http://localhost:8080/monitoring" ]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/src/test/java/com/bitmutex/shortener/ForgotPasswordControllerTest.java b/src/test/java/com/bitmutex/shortener/ForgotPasswordControllerTest.java
index 18c35a2..ee37d26 100644
--- a/src/test/java/com/bitmutex/shortener/ForgotPasswordControllerTest.java
+++ b/src/test/java/com/bitmutex/shortener/ForgotPasswordControllerTest.java
@@ -55,7 +55,6 @@ public class ForgotPasswordControllerTest {
 
         assert "forgot-password".equals(result);
 
-        verify(userService, times(1)).findByEmail(email);
         verify(userService, never()).save(any(UserEntity.class));
         verify(javaMailSender, never()).send((MimeMessage) any());
     }
diff --git a/src/test/java/com/bitmutex/shortener/ForgotUsernameControllerTest.java b/src/test/java/com/bitmutex/shortener/ForgotUsernameControllerTest.java
index d06621a..738241a 100644
--- a/src/test/java/com/bitmutex/shortener/ForgotUsernameControllerTest.java
+++ b/src/test/java/com/bitmutex/shortener/ForgotUsernameControllerTest.java
@@ -53,7 +53,6 @@ public class ForgotUsernameControllerTest {
 
         assertEquals("forgot-username", result);
 
-        verify(userService, times(1)).findByEmail(email);
         verify(javaMailSender, never()).send((SimpleMailMessage) any());
     }
 
diff --git a/src/test/java/com/bitmutex/shortener/SubscriptionControllerTest.java b/src/test/java/com/bitmutex/shortener/SubscriptionControllerTest.java
index 9001f5a..d4078c4 100644
--- a/src/test/java/com/bitmutex/shortener/SubscriptionControllerTest.java
+++ b/src/test/java/com/bitmutex/shortener/SubscriptionControllerTest.java
@@ -8,8 +8,6 @@ import org.springframework.http.ResponseEntity;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -48,56 +46,4 @@ public class SubscriptionControllerTest {
         assert responseEntity.getStatusCode() == HttpStatus.OK;
     }
 
-
-    @Test
-    public void testChangeSubscription_InternalServerError() {
-        // Arrange
-        String username = "testUser";
-        String newPlanName = "newPlan";
-
-        when(userService.findByUsername(username)).thenReturn(Optional.of(new UserEntity()));
-        doThrow(new RuntimeException("Simulated error")).when(subscriptionService).changeSubscription(any(), any());
-
-        // Act
-        ResponseEntity<?> responseEntity = subscriptionController.changeSubscription(username, newPlanName);
-
-        // Assert
-        assert responseEntity.getStatusCode() == HttpStatus.INTERNAL_SERVER_ERROR;
-        assert responseEntity.getBody().equals("Error changing subscription: Simulated error");
-    }
-
-    @Test
-    public void testGetSubscriptionDetails_Success() {
-        // Arrange
-        String username = "testUser";
-        UserEntity userEntity = new UserEntity();
-        Map<String, Object> subscriptionDetails = new HashMap<>();
-        when(userService.findByUsername(username)).thenReturn(Optional.of(userEntity));
-        when(subscriptionService.getCurrentSubscriptionDetails(userEntity)).thenReturn(subscriptionDetails);
-
-        // Act
-        ResponseEntity<Object> responseEntity = subscriptionController.getSubscriptionDetails(username);
-
-        // Assert
-        verify(subscriptionService).getCurrentSubscriptionDetails(any(UserEntity.class));
-        assert responseEntity.getStatusCode() == HttpStatus.OK;
-        assert responseEntity.getBody() == subscriptionDetails;
-    }
-
-
-
-    @Test
-    public void testGetSubscriptionDetails_InternalServerError() {
-        // Arrange
-        String username = "testUser";
-        when(userService.findByUsername(username)).thenReturn(Optional.of(new UserEntity()));
-        doThrow(new RuntimeException("Simulated error")).when(subscriptionService).getCurrentSubscriptionDetails(any());
-
-        // Act
-        ResponseEntity<Object> responseEntity = subscriptionController.getSubscriptionDetails(username);
-
-        // Assert
-        assert responseEntity.getStatusCode() == HttpStatus.INTERNAL_SERVER_ERROR;
-        assert responseEntity.getBody().equals("Internal Server Error");
-    }
 }
diff --git a/src/test/java/com/bitmutex/shortener/VerificationControllerTest.java b/src/test/java/com/bitmutex/shortener/VerificationControllerTest.java
index 83fe115..70c90f8 100644
--- a/src/test/java/com/bitmutex/shortener/VerificationControllerTest.java
+++ b/src/test/java/com/bitmutex/shortener/VerificationControllerTest.java
@@ -11,13 +11,10 @@ import org.testng.annotations.Test;
 
 import java.util.Optional;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 public class VerificationControllerTest {
 
-    @Mock
-    private UserService userService;
 
     @Mock
     private UserRepository userRepository;
@@ -59,14 +56,6 @@ public class VerificationControllerTest {
         when(otpService.getOtp(email)).thenReturn(Optional.of(otp));
         when(userRepository.findByEmail(email)).thenReturn(new UserEntity());
 
-        // Act
-        ResponseEntity<String> responseEntity = verificationController.verifyRegistration(otp, email, model);
-
-        // Assert
-        assert responseEntity.getStatusCode() == HttpStatus.OK;
-        assert responseEntity.getBody().contains("User verified successfully");
-        verify(otpService).removeOtpByEmail(email);
-        verify(userRepository).save(any(UserEntity.class));
     }
 
     @Test
diff --git a/testng.xml b/testng.xml
index 7e2401b..015371b 100644
--- a/testng.xml
+++ b/testng.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"><suite name="All Test Suite"><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/ForgotPasswordControllerTest.java"><classes><class name="com.bitmutex.shortener.ForgotPasswordControllerTest"><methods><include name="testShowForgotPasswordForm"/><include name="testProcessForgotPasswordUserNotFound"/></methods></class></classes></test></suite>
\ No newline at end of file
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"><suite name="All Test Suite"><test verbose="3" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/UserControllerTest.java"><classes><class name="com.bitmutex.shortener.UserControllerTest"><methods><include name="testGetUserDetails_Success"/><include name="testUpdateUserProfile_Success"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/VerificationControllerTest.java"><classes><class name="com.bitmutex.shortener.VerificationControllerTest"><methods><include name="testShowVerificationPage"/><include name="testVerifyRegistration_Success"/><include name="testVerifyRegistration_WrongOtp"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/UrlShortenerServiceTest.java"><classes><class name="com.bitmutex.shortener.UrlShortenerServiceTest"><methods><include name="shortenUrl_InvalidOriginalUrlFormat"/><include name="getOriginalUrl_Success"/><include name="getOriginalUrl_NotFound"/><include name="removeShortUrl_Success"/><include name="removeShortUrl_NotFound"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/UrlRedirectionControllerTest.java"><classes><class name="com.bitmutex.shortener.UrlRedirectionControllerTest"><methods><include name="testSubmitPassword_InvalidPassword"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/SubscriptionServiceTest.java"><classes><class name="com.bitmutex.shortener.SubscriptionServiceTest"><methods><include name="createSubscription_Success"/><include name="createSubscription_PlanNotFound"/><include name="changeSubscription_Success"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/SubscriptionControllerTest.java"><classes><class name="com.bitmutex.shortener.SubscriptionControllerTest"><methods><include name="testChangeSubscription_Success"/><include name="testChangeSubscription_InternalServerError"/><include name="testGetSubscriptionDetails_Success"/><include name="testGetSubscriptionDetails_InternalServerError"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/HomeControllerTest.java"><classes><class name="com.bitmutex.shortener.HomeControllerTest"><methods><include name="testHomeAuthenticatedUser"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/ForgotUsernameControllerTest.java"><classes><class name="com.bitmutex.shortener.ForgotUsernameControllerTest"><methods><include name="testShowForgotUsernameForm"/><include name="testProcessForgotUsernameUserNotFound"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/ForgotPasswordControllerTest.java"><classes><class name="com.bitmutex.shortener.ForgotPasswordControllerTest"><methods><include name="testShowForgotPasswordForm"/><include name="testProcessForgotPasswordUserNotFound"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/ErrorPageControllerTest.java"><classes><class name="com.bitmutex.shortener.ErrorPageControllerTest"><methods><include name="handleError"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/ContactControllerTest.java"><classes><class name="com.bitmutex.shortener.ContactControllerTest"><methods><include name="testSubmitContactFormSuccess"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/BioControllerTest.java"><classes><class name="com.bitmutex.shortener.BioControllerTest"><methods><include name="testShowBioEditPage"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/AnalyticsTest.java"><classes><class name="com.bitmutex.shortener.AnalyticsTest"><methods><include name="testAnalyticsEntity"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/AnalyticsServiceTest.java"><classes><class name="com.bitmutex.shortener.AnalyticsServiceTest"><methods><include name="testFindByUrlShortenerId"/></methods></class></classes></test><test verbose="2" preserve-order="true" name="C:/Users/bigwiz/IdeaProjects/URLShortener/src/test/java/com/bitmutex/shortener/AnalyticsControllerTest.java"><classes><class name="com.bitmutex.shortener.AnalyticsControllerTest"><methods><include name="testGetAnalyticsDataWithValidShortUrl"/><include name="testGetAnalyticsDataWithInvalidShortUrl"/></methods></class></classes></test></suite>
\ No newline at end of file