diff --git a/cms-core/configs/site-dev.toml b/cms-core/configs/site-dev.toml
new file mode 100644
index 000000000..ac29b9256
--- /dev/null
+++ b/cms-core/configs/site-dev.toml
@@ -0,0 +1 @@
+hostname = [ "localhost" ]
\ No newline at end of file
diff --git a/cms-core/configs/site.toml b/cms-core/configs/site.toml
index 0ecbd5092..4e1c89e6e 100644
--- a/cms-core/configs/site.toml
+++ b/cms-core/configs/site.toml
@@ -1,5 +1,5 @@
 id = "condation"
-hostname = [ "condation.com", "localhost" ]
+hostname = [ "condation.com"]
 baseurl = "https://condation.com"
 
 [template]
diff --git a/cms-core/src/test/java/com/condation/cms/core/configuration/SiteConfigurationTest.java b/cms-core/src/test/java/com/condation/cms/core/configuration/SiteConfigurationTest.java
index cdf79b9e8..5d6dfc66b 100644
--- a/cms-core/src/test/java/com/condation/cms/core/configuration/SiteConfigurationTest.java
+++ b/cms-core/src/test/java/com/condation/cms/core/configuration/SiteConfigurationTest.java
@@ -29,23 +29,17 @@
 import com.condation.cms.api.eventbus.EventBus;
 import com.condation.cms.api.scheduler.CronJobContext;
 import com.condation.cms.api.scheduler.CronJobScheduler;
-import com.condation.cms.api.utils.FileUtils;
 import com.condation.cms.core.configuration.reload.CronReload;
-import com.condation.cms.api.eventbus.events.ConfigurationReloadEvent;
 import com.condation.cms.core.configuration.properties.ExtendedSiteProperties;
 import com.condation.cms.core.scheduler.SingleCronJobScheduler;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.time.Duration;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
@@ -58,44 +52,23 @@
 @ExtendWith(MockitoExtension.class)
 public class SiteConfigurationTest {
 
-	SimpleConfiguration configuration;
-	
-	Scheduler scheduler;
-	CronJobScheduler cronScheduler;
-
-	@Mock
-	SiteProperties siteProperties;
-	
-	@Mock
-	EventBus eventBus;
-	
-	private ExtendedSiteProperties extSiteProperties;
+	private SimpleConfiguration siteConfig;
+	private ExtendedSiteProperties siteProperties;
 	
 	@BeforeEach
 	public void setup() throws IOException, SchedulerException {
-		scheduler = StdSchedulerFactory.getDefaultScheduler();
-		scheduler.start();
-		cronScheduler = new SingleCronJobScheduler(scheduler, new CronJobContext(), siteProperties);
-		
-		configuration = SimpleConfiguration.builder(eventBus)
-				.id("test-config")
-				.reloadStrategy(new CronReload("0/10 * * * * ?", cronScheduler))
-				.addSource(YamlConfigSource.build(Path.of("configs/site.yaml")))
-				.addSource(TomlConfigSource.build(Path.of("configs/site.toml")))
-				.build();
+		siteConfig = ConfigurationFactory.siteConfiguration("dev", Path.of("configs"));
 		
-		extSiteProperties = new ExtendedSiteProperties(configuration);
+		siteProperties = new ExtendedSiteProperties(siteConfig);
 	}
 	
 	@AfterEach
 	public void shutdown () throws SchedulerException {
-		scheduler.clear();
-		scheduler.shutdown();
 	}
 
 	@Test
 	public void test_hostname() {
-		var hostnames = extSiteProperties.hostnames();
+		var hostnames = siteProperties.hostnames();
 		
 		Assertions.assertThat(hostnames).contains("localhost", "condation.com");
 	}