diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
index 7cee004886117c6a8e98eaaae0c2d2d24be6d260..17313516ed9bb4273af431ae52d4f5b5ee72dec9 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
@@ -103,7 +103,7 @@ class KeycloakRealmMapperTest {
 		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 		var mappedSmtpServer = mapped.getSmtpServer();
 		assertThat(mappedSmtpServer.get("host")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_HOST);
-		assertThat(mappedSmtpServer.get("port")).isEqualTo("432");
+		assertThat(mappedSmtpServer.get("port")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_PORT);
 		assertThat(mappedSmtpServer.get("password")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_PASSWORD);
 		assertThat(mappedSmtpServer.get("user")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_USER);
 		assertThat(mappedSmtpServer.get("starttls")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_STARTTLS);
@@ -111,15 +111,6 @@ class KeycloakRealmMapperTest {
 		assertThat(mappedSmtpServer.get("from")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM);
 		assertThat(mappedSmtpServer.get("fromDisplayName")).isEqualTo(KeycloakRealmSmtpServerTestFactory.SMTP_SERVER_FROM_DISPLAY_NAME);
 		
-	}	
-
-
-	@Test
-	void shouldNotThrowOnRealmWithoutSMTP() {
-		//create realm without SMTP Servr configs
-		OzgCloudKeycloakRealm realm = OzgCloudKeycloakRealmTestFactory.create();
-		assertDoesNotThrow(() -> mapper.map(realm.getSpec()));
-	}
-	
+	}		
 
 }
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
index 146211a6b34bb0bffe9105889b7d95d5a98a8585..14cf8074e47270f51647980ddabeed3febcc4251 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
@@ -73,9 +73,12 @@ class KeycloakRealmReconcilerTest {
 		}
 
 		@Test
-		void shouldCreateRealmWithSpecWithoutSMTPConfig() {
-			var response = reconciler.reconcile(OzgCloudKeycloakRealmTestFactory.create(), null);
-			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
+		void shouldCreateRealmWithSpecWithoutSMTPServer() {
+			OzgCloudKeycloakRealm realm = OzgCloudKeycloakRealmTestFactory.create();
+			reconciler.reconcile(realm, null);
+			var spec = realm.getSpec();
+			spec.setSmtpServer(null);
+			verify(service).createRealm(spec, OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE);
 		}
 	}