diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java
index 39f465e..1db1401 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Game.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Game.java
@@ -96,8 +96,22 @@
         return keyword;
     }
 
-    public Map<Integer, String> getKeywords() {
-        return keywordList;
+    public List<String> getKeywords() {
+        List<String> keywords = new ArrayList<>();
+        for(int i=0; i<16; i++){
+            keywords.add(keywordList.get(map.get(i)));
+        }
+        return keywords;
+    }
+
+    public List<Boolean> getOpens(){
+        List<Boolean> opens= new ArrayList<>();
+        for(int i=0; i<16; i++){
+            Cell cell = cellList.get(i);
+            boolean isOpen = cell.getIsOpen();
+            opens.add(isOpen);
+        }
+        return opens;
     }
 
     public Map<Member, List<Integer>> getAssignments(){
diff --git a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java
index 649c906..babe777 100644
--- a/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/DrawingsRest.java
@@ -57,7 +57,7 @@
         String drawingPath = "";
 
         try {
-            pathDirectory = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps";
+            pathDirectory = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps/irisdata/image";
             System.out.println("kota0210/保存前のディレクトリのパス：" + pathDirectory.toString());
             System.out.println("kota0210/クライアントから届いたBASE64の文字列"+ drawingStr.toString());
             // utilsのBase64Decodeにデコードしてもらって、そのついでに保存してもらう
diff --git a/src/main/java/com/ntlab/irisserver/resources/GameRest.java b/src/main/java/com/ntlab/irisserver/resources/GameRest.java
index 734c312..228aeb0 100644
--- a/src/main/java/com/ntlab/irisserver/resources/GameRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/GameRest.java
@@ -46,12 +46,7 @@
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
         Game game = room.getGame();
-        Map<Integer, String> keywordList = game.getKeywords();
-        List<Integer> map = game.getMap();
-        List<String> keywords = new ArrayList<>();
-        for(int i=0; i<16; i++){
-            keywords.add(keywordList.get(map.get(i)));
-        }
+        List<String> keywords = game.getKeywords();
         return keywords;
     }
 
diff --git a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java
index ceb84a3..c5b0966 100644
--- a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java
@@ -20,15 +20,10 @@
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public  List<Boolean> getOpens(@PathParam("rid") String rid){
-        List<Boolean> opens= new ArrayList<>();
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
         Game game = room.getGame();
-        for(int i=0; i<16; i++){
-            Cell cell = game.getCell(i);
-            boolean isOpen = cell.getIsOpen();
-            opens.add(isOpen);
-        }
+        List<Boolean> opens = game.getOpens();
         return opens;
     }
 
diff --git a/src/main/java/com/ntlab/irisserver/resources/TestRest.java b/src/main/java/com/ntlab/irisserver/resources/TestRest.java
index e2dfc6a..987c031 100644
--- a/src/main/java/com/ntlab/irisserver/resources/TestRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/TestRest.java
@@ -1,13 +1,17 @@
 package com.ntlab.irisserver.resources;
 
+import com.ntlab.irisserver.entities.Game;
 import com.ntlab.irisserver.entities.Member;
 import com.ntlab.irisserver.entities.Room;
 import com.ntlab.irisserver.models.KeywordManager;
 import com.ntlab.irisserver.models.RoomManager;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
@@ -15,7 +19,13 @@
 @Component
 @Path("/rooms")
 
-public class TestRest {
+public class TestRest implements ApplicationContextAware {
+
+    private org.springframework.context.ApplicationContext applicationContext;
+
+    public void setApplicationContext(org.springframework.context.ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
 
     @PUT
     @Path("/test")
@@ -78,7 +88,21 @@
             }
         }
 
-        //drawtestの設定
+        //両部屋：gameインスタンス作成,stateの初期化
+        String path = null;
+        dr.setState(2);
+        dr.setState(3);
+        try {
+            path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt";
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        String[] keywords = km.getKeywords(path);
+        Game dgame = new Game(dr, keywords);
+        Game game = new Game(gr, keywords);
+
+        //gametest部屋：絵の格納
+
     }
 
 
diff --git a/src/main/java/com/ntlab/irisserver/utils/Base64Decode.java b/src/main/java/com/ntlab/irisserver/utils/Base64Decode.java
index 6414064..7588ce1 100644
--- a/src/main/java/com/ntlab/irisserver/utils/Base64Decode.java
+++ b/src/main/java/com/ntlab/irisserver/utils/Base64Decode.java
@@ -17,8 +17,7 @@
 
         //ファイルを作成する
         String fileName =  rid + "-" + dno.toString() + ".png";
-        String path2 = "irisdata";
-        String path = path1 + "/" + path2 + "/" + fileName;
+        String path = path1 + "/" + fileName;
 
         System.out.println("kota0210/path作れました"+path.toString());