diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java
index b1dc701..0ee896b 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -5,17 +5,17 @@
 
 
 public class User {
-    public String uId, uri, name, pw, iconImage, iconUri;
-    public boolean login = false;
+    public String uId, uri, name, pw, iconUri;
+    public boolean login = true;
     public List<String> token = new ArrayList<String>();
 
-    public User(String name, String uId,String uri,String pw,ArrayList token,String iconImage,String iconUri) {
+    public User(String name, String uId,String uri,String pw,ArrayList token,String iconUri) {
         this.name = name;
         this.uId = uId;
         this.uri=uri;
         this.pw=pw;
         this.token = new ArrayList<String>();//test
-        this.iconImage=iconImage;
+        //this.iconImage=iconImage;
         this.iconUri=iconUri;
     }
 }
diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java
index b853230..9c07b91 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -32,14 +32,14 @@
     }
 
     public static User createUser(String name, String pw, String iconImage) {
-        User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", null, "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
         testUser.token.add(getInstance().createToken(testUser.uId));
         testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
 
     public static User setUser(String uId, String name, String pw, String iconImage) {
-        User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", null, "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
         testUser.token.add(getInstance().createToken(testUser.uId));
         testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
@@ -47,7 +47,7 @@
 
     public static User getUserById(String uId) {
         //与えられたuIdのUser情報を返す
-        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
         testUser.token.add(getInstance().createToken(testUser.uId));
         testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
@@ -55,7 +55,7 @@
 
     public static User getUserByToken(String token) {
         //与えられたTokenに紐づくUser情報を返す
-        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
         testUser.token.add(getInstance().createToken(testUser.uId));
         testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
@@ -71,7 +71,12 @@
     }
 
     public static DeleteResult logout(String token) {
-        return DeleteResult.SUCCESS;
+        if(Users.getInstance().getUserByToken(token).uId == null) {
+            return DeleteResult.FAILURE;
+        }else{
+            Users.getInstance().getUserByToken(token).token.remove(Users.getInstance().getUserByToken(token).token.indexOf(token));
+            return DeleteResult.SUCCESS;
+        }
     }
 
     public static boolean checkToken(String uId, String token) {
diff --git a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java
index a9da0ab..8c2ed74 100644
--- a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java
+++ b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java
@@ -5,6 +5,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.ws.rs.*;
+
 import com.example.cosmos_serversb.models.*;
 
 @Component
@@ -17,7 +18,7 @@
             @FormParam("pw") String pw,
             @FormParam("iconImage") String iconImage) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(Users.createUser(name,pw,iconImage));
+        String json = mapper.writeValueAsString(Users.getInstance().createUser(name, pw, iconImage));
 
         return json;
     }
@@ -28,7 +29,7 @@
             @PathParam("uId") String uId,
             @QueryParam("token") String token) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(Users.getUserById("1234"));
+        String json = mapper.writeValueAsString(Users.getInstance().getUserById(uId));
 
         return json;
     }
@@ -42,7 +43,7 @@
             @FormParam("pw") String pw,
             @FormParam("iconImage") String iconImage) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(Users.setUser("1234","1234","1234","1234"));
+        String json = mapper.writeValueAsString(Users.getInstance().setUser(uId, name, pw, iconImage));
 
         return json;
     }
@@ -53,7 +54,7 @@
             @PathParam("uId") String uId,
             @FormParam("token") String token) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(Users.deleteUser("1234"));
+        String json = mapper.writeValueAsString(Users.getInstance().deleteUser(uId));
 
         return json;
     }
@@ -64,7 +65,7 @@
             @PathParam("uId") String uId,
             @FormParam("pw") String pw) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(Users.login("1234"));
+        String json = mapper.writeValueAsString(Users.getInstance().login(uId));
 
         return json;
     }
@@ -75,7 +76,7 @@
             @PathParam("uId") String uId,
             @FormParam("token") String token) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(Users.logout("1234"));
+        String json = mapper.writeValueAsString(Users.getInstance().logout(token));
 
         return json;
     }
diff --git a/static/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg b/static/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg
new file mode 100644
index 0000000..6f15302
--- /dev/null
+++ b/static/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg
Binary files differ