diff --git a/src/main/java/com/example/cosmos_serversb/entities/Group.java b/src/main/java/com/example/cosmos_serversb/entities/Group.java
index 4508c5d..63a76cb 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/Group.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java
@@ -88,7 +88,7 @@
         //User user = new User(uId, uId, "http:test", "sa", "hogehoge");
         User user = Users.getInstance().getUserById(uId);
         members.add(user);
-        user.addGroups(this);
+//        user.addGroups(this);
     }
 
 }
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 c2c2b1c..a930715 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -2,9 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class User {
     public String uId, uri, name, iconUri;
     public boolean login = true;
+    public Set<Group> groups = new HashSet<>();//HashSetでいいのかな？
 
     public User() {
 
@@ -63,4 +67,18 @@
     public void setLogin(boolean login) {
         this.login = login;
     }
+
+    public Set<Group> getGroups() {
+        return groups;
+    }
+
+    public void setGroups(Set<Group> groups) {
+        this.groups = groups;
+    }
+
+    public void addGroups(Group group){
+        //テスト用
+        //Group group = Groups.getInstance().getGroupByGid(gId);
+        groups.add(group);
+    }
 }
\ No newline at end of file
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 0a52560..b844d99 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -20,31 +20,6 @@
     private static String baseURI = "http://nitta-lab-www.is.konan-u.ac.jp/";
     private static String AppName = "cosmos";
 
-    public static void setUp() {
-        // A SessionFactory is set up once for an application!
-        final StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
-                .configure() // configures settings from hibernate.cfg.xml
-                .build();
-        try {
-            sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory();
-        }
-        catch (Exception e) {
-            // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
-            // so destroy it manually.
-            StandardServiceRegistryBuilder.destroy( registry );
-        }
-    }
-
-    public static void tearDown() {
-        try {
-            if (sessionFactory != null) {
-                sessionFactory.close();
-            }
-        } catch (Exception e) {
-            System.out.println("Exception!");
-        }
-    }
-
     private Users() {
         sessionFactory = SessionFactoryManager.getInstance().getSessionFactory();
     }
@@ -80,7 +55,7 @@
 
         Session session = sessionFactory.openSession();
         session.beginTransaction();
-        createToken(uId);
+//        createToken(uId);
         User testUser = new User(name, uId, uri, iconImage);//名前、uId、ユーザーuri、パスワード、アイコンイメージを保存
         session.save(testUser);
         //出力
@@ -130,7 +105,7 @@
 //                User testUser = mapper.addMixIn(findUser,findUser.removeuIdAnduri);
                 mapper.addMixIn(User.class, User.removeuIdAnduri.class);
                 return null;
-                System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());]
+//                System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());
             }else{
                 break;
             }
@@ -165,6 +140,7 @@
         if(checkPassword(uId,pw)) {
             Token testtoken = getInstance().createToken(uId);
             //tokenを作成後値を返す
+//            System.out.println("true");
             return testtoken;//testToken
         }else{
             return null;
diff --git a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java
index d1dffcf..ea61319 100644
--- a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java
+++ b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java
@@ -3,10 +3,9 @@
 //このメインクラスを実行すると、Hibernateのテストが行えます。
 public class UsersMain {
     public static void main(String args[]){
-        Users.setUp();
-        Users.createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
+        Users.getInstance().createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
+        Users.login("1234","test1");
         //Users.setUser("1234","test3","test3","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
         // Users.getUserById("1234");
-        Users.tearDown();
     }
 }