diff --git a/src/main/java/models/Algo.java b/src/main/java/models/Algo.java
index 391cb4b..319ee10 100644
--- a/src/main/java/models/Algo.java
+++ b/src/main/java/models/Algo.java
@@ -63,11 +63,11 @@
 	public void inputSelectA(int guess, int attacker,  int target) {
 		this.succeedSelectA.inputSelectA(guess, attacker, target);
 	}
-	public void inputDrawA(int guess, List<Map.Entry<Object, Boolean>> b, int target) {
-		this.succeedDrawA.inputDrawA(guess, b, target);
+	public void inputDrawA(int guess, int target) {
+		this.succeedDrawA.inputDrawA(guess, target);
 	}
-	public void inputDrawB(int guess, List<Map.Entry<Object, Boolean>> a, int target) {
-		this.succeedDrawB.inputDrawB(guess, a, target);
+	public void inputDrawB(int guess, int target) {
+		this.succeedDrawB.inputDrawB(guess,  target);
 	}
 	public void inputSelectB(int guess, int attacker,  int target) {
 		this.succeedSelectB.inputSelectB(guess, attacker, target);
@@ -81,7 +81,7 @@
 	public Map.Entry<Boolean, Map.Entry<Integer, Integer>> getSucceedSelectA() {
 		return succeedSelectA.getValue();
 	}
-	public List getDeck() {
+	public List<Map.Entry<Integer, Boolean>> getDeck() {
 		return deck.getValue();
 	}
 	public Map.Entry<Boolean, Integer> getSucceedDrawB() {
diff --git a/src/main/java/models/Algotest.java b/src/main/java/models/Algotest.java
index 94de59f..9fd79ab 100644
--- a/src/main/java/models/Algotest.java
+++ b/src/main/java/models/Algotest.java
@@ -26,11 +26,11 @@
 	public void inputSelectA(int guess, int attacker,  int target) {
 		this.succeedSelectA.inputSelectA(guess, attacker, target);
 	}
-	public void inputDrawA(int guess, List<Map.Entry<Object, Boolean>> b, int target) {
-		this.succeedDrawA.inputDrawA(guess, b, target);
+	public void inputDrawA(int guess, int target) {
+		this.succeedDrawA.inputDrawA(guess, target);
 	}
-	public void inputDrawB(int guess, List<Map.Entry<Object, Boolean>> a, int target) {
-		this.succeedDrawB.inputDrawB(guess, a, target);
+	public void inputDrawB(int guess, int target) {
+		this.succeedDrawB.inputDrawB(guess, target);
 	}
 	public void inputSelectB(int guess, int attacker,  int target) {
 		this.succeedSelectB.inputSelectB(guess, attacker, target);
diff --git a/src/main/java/models/SucceedDrawA.java b/src/main/java/models/SucceedDrawA.java
index 0bce37a..68871d8 100644
--- a/src/main/java/models/SucceedDrawA.java
+++ b/src/main/java/models/SucceedDrawA.java
@@ -11,9 +11,9 @@
 	public SucceedDrawA(HandsB handsB, Deck deck, HandsA handsA) {
 		this.handsB = handsB;
 		this.deck = deck;
-		this.handsB = handsB;
+		this.handsA = handsA;
 	}
-	public void inputDrawA(int guess, List<Map.Entry<Object, Boolean>> b, int target) {
+	public void inputDrawA(int guess, int target) {
 		this.value = new AbstractMap.SimpleEntry<>((handsB.getValue().get(target).getKey()==guess), target);
 		List deck = this.deck.getValue();
 		this.handsB.updateSucceedDrawA(value, deck);
diff --git a/src/main/java/models/SucceedDrawB.java b/src/main/java/models/SucceedDrawB.java
index 28a6475..40c3761 100644
--- a/src/main/java/models/SucceedDrawB.java
+++ b/src/main/java/models/SucceedDrawB.java
@@ -12,7 +12,7 @@
 		this.handsB = handsB;
 		this.handsA = handsA;
 	}
-	public void inputDrawB(int guess, List<Map.Entry<Object, Boolean>> a, int target) {
+	public void inputDrawB(int guess, int target) {
 		this.value = new AbstractMap.SimpleEntry<>((handsA.getValue().get(target).getKey()==guess), target);
 		this.deck.updateSucceedDrawB(value);
 		List deck = this.deck.getValue();
diff --git a/src/test/java/AlgoTest.java b/src/test/java/AlgoTest.java
index b0a8783..a24b052 100644
--- a/src/test/java/AlgoTest.java
+++ b/src/test/java/AlgoTest.java
@@ -25,7 +25,8 @@
         var guess = algo.getHandsB().get(0).getKey();
         var target = 0;
         //テスト対象メソッド
-        algo.drawA(guess, target);
+        //algo.drawA(guess, target);
+        algo.inputDrawA(guess,target);
 
         printState(algo);
         //Aはデッキから引いているので,実行前と比べて枚数が1枚増えているか
@@ -47,8 +48,8 @@
         var target = 0;
         var top = algo.getDeck().get(0);
         //テスト対象メソッド
-        algo.drawA(guess, target);
-
+     //   algo.drawA(guess, target);
+        algo.inputDrawA(guess, target);
         printState(algo);
         //Aはデッキから引いているので,実行前と比べて枚数が1枚増えている
 
@@ -71,8 +72,8 @@
         var guess = algo.getHandsA().get(0).getKey();
         var target = 0;
         //テスト対象メソッド
-        algo.drawB(guess, target);
-
+     //   algo.drawB(guess, target);
+        algo.inputDrawB(guess, target);
         printState(algo);
         //Aはデッキから引いているので,実行前と比べて枚数が1枚増えているか
         assertEquals(iniHandsBNum+1,algo.getHandsB().size());
@@ -92,8 +93,8 @@
         var attacker = 0;
 
         //テスト対象メソッド
-        algo.selectA(guess, attacker, target);
-
+        //algo.selectA(guess, attacker, target);
+        algo.inputSelectA(guess, attacker, target);
         printState(algo);
         //Aによってアタックを成功されたBのカードが表になっているか
         assertEquals(true, algo.getHandsB().get(target).getValue());
@@ -110,8 +111,8 @@
         var attacker = 0;
         var guess = algo.getHandsB().get(target).getKey()+1;
         //テスト対象メソッド
-        algo.selectA(guess, attacker, target);
-
+       // algo.selectA(guess, attacker, target);
+        algo.inputSelectA(guess, attacker, target);
         printState(algo);
         //Aによってアタックを成功されたBのカードが表になっていないか
         assertEquals(false, algo.getHandsB().get(target).getValue());
@@ -151,6 +152,7 @@
         printViewA(algo);
     }
 
+
     void printState(Algo algo){
         String s="";
         s+="deck:\n";