diff --git a/tests/ggs_db_test.erl b/tests/ggs_db_test.erl
index dcebdb9..0ee4686 100644
--- a/tests/ggs_db_test.erl
+++ b/tests/ggs_db_test.erl
@@ -12,39 +12,31 @@
 getItem_setItem_test() -> 
     ggs_db:init(),
     ggs_db:setItem("dbname","nsname","keyname1","Hello"),
-    ggs_db:setItem("dbname","nsname","keyname2","Hello"),
-    ggs_db:setItem("dbname","nsname","keyname3","Hello"),
-    %system:wait(2000),
-    ggs_db:getItem("dbname","nsname","keyname").
+    ggs_db:setItem("dbname","nsname","keyname2","Hello2"),
+    ggs_db:setItem("dbname2","nsname","keyname1","Hello3"),
+    ggs_db:setItem("dbname2","nsname","keyname1","Hello4"),
+    ggs_db:setItem("dbname3","nsname","keyname1","Hello5"),
+    "Hello" = ggs_db:getItem("dbname","nsname","keyname1").
 
-%length_test() ->
-%    ggs_db:setItem(1,1,2,"112"),
-%    ggs_db:setItem(1,2,2,"122"),
-%    ggs_db:setItem(1,1,3,"113"),
-%    ggs_db:setItem(1,1,4,"114"),
-%    ?assertEqual(ggs_db:length(1,1), 3).
+length_test() ->
+    ggs_db:setItem(1,1,2,"112"),
+    ggs_db:setItem(1,2,2,"122"),
+    ggs_db:setItem(1,1,3,"113"),
+    ggs_db:setItem(1,1,4,"114"),
+    ?assertEqual(ggs_db:length(1,1), 3).
 
-%removeItem_test() ->
-%    ggs_db:removeItem(1,1,4),
-%    ?assertNot(ggs_db:getItem(1,1,4) =:= {atomic,"114"}).
+removeItem_test() ->
+    ggs_db:removeItem(1,1,4),
+    ?assertNot(ggs_db:getItem(1,1,4) =:= "114").
 
-%key_test() ->
-%    ?assert(ggs_db:key(1,1,2) =:= {1,1,3}).
+key_test() ->
+    ?assert(ggs_db:key(1,1,2) =:= {1,1,3}).
 
-%clear_test() ->
-%    ggs_db:clear(1,1),
-%    ?assert(ggs_db:length(1,1) =:= 0).
-
-%clear_GameToken_test() ->
-%    ggs_db:clear(1),
-%    ?assert((ggs_db:length(1,1) + ggs_db:length(1,2)) =:= 0),
-%    ggs_db:stop().
-
-%tests() ->
-%    ggs_db_test().
-
-%ggs_db_test() ->
-%    ggs_db:set(0, "Hello"),
-    %io:format("~s",[Val]),
-%    ?assertMatch({atomic,"Hello"},ggs_db:get(0)).
+clear_test() ->
+    ggs_db:clear(1,1),
+    ?assert(ggs_db:length(1,1) =:= 0).
 
+clear_GameToken_test() ->
+    ggs_db:clear(1),
+    ?assert((ggs_db:length(1,1) + ggs_db:length(1,2)) =:= 0),
+    ggs_db:stop().