diff --git a/src/server/server.java b/src/server/server.java
index 617f660..b1daa14 100644
--- a/src/server/server.java
+++ b/src/server/server.java
@@ -38,15 +38,9 @@ public static server getInstance() {
 	
 	public server() throws Exception {
 		// Default admin user
-		String adminPassword = "admin";
-		String ip = "127.0.0.1";
-		String email = "admin@uconn.edu";
-		String serialNumber = "00000011TEST";
-
-        dataStorage = new Database(this);
-		dataStorage.createUser(email, adminPassword, ip, serialNumber);
-        dataStorage.giveUserAccessToDeviceByEmailAndSerialNumber(email, serialNumber);
-        System.out.println(dataStorage.getDevicesFromEmail("admin@uconn.edu"));
+		this.dataStorage = new Database(this);
+		this.createTestUser();
+		this.creatTestDevice();
 		this.startServerListenerThreadCurrentTemp();
         dataStorage.printStruct();
         instance = this;
@@ -190,7 +184,28 @@ public void run() {
 		};
 	}
 	*/
-	
+
+	private void createTestUser(){
+		String adminPassword = "admin";
+		String ip = "127.0.0.1";
+		String email = "admin@uconn.edu";
+		String serialNumber = "00000011TEST";
+
+
+		this.dataStorage.createUser(email, adminPassword, ip, serialNumber);
+		this.dataStorage.giveUserAccessToDeviceByEmailAndSerialNumber(email, serialNumber);
+		System.out.println(this.dataStorage.getDevicesFromEmail("admin@uconn.edu"));
+	}
+
+	private void creatTestDevice(){
+		String deviceName = "Living Room";
+		String ip = "127.0.0.2";
+		String serialNumber = "00000011TEST";
+		String currentTemp = "73";
+
+		this.dataStorage.createThermostat(serialNumber, deviceName, ip, currentTemp, "80");
+	}
+
 	public void datastructureLogEvent(String query) {
 	}