diff --git a/src/ggs_table.erl b/src/ggs_table.erl
index db247c4..1e4f323 100644
--- a/src/ggs_table.erl
+++ b/src/ggs_table.erl
@@ -101,14 +101,38 @@ code_change(_OldVsn, State, _Extra) ->
 % Tests
 
 start_link_test() ->
-	ClientToken = "123",
-	Pid = start_link(ClientToken, none),
-	?assertNot(Pid =:= undefined).
+	Table = start_link("123", none),
+	?assertNot(Table =:= undefined).
 	
 add_player_test() ->
 	Table = start_link("123", none),
-	Player = "test", %ggs_player:start_link(none),
+	Player = test_player,
 	add_player(Table, Player),
 	{ok, [Player]} = gen_server:call(Table, get_player_list).
 	
+remove_player_test() ->
+	Table = start_link("123", none),
+	Player = test_player,
+	Player2 = test_player2,
+	add_player(Table, Player),
+	{ok, [Player]} = gen_server:call(Table, get_player_list),
+	add_player(Table, Player2),
+	{ok, [Player2, Player]} = gen_server:call(Table, get_player_list),	
+	remove_player(Table, Player),
+	{ok, [Player2]} = gen_server:call(Table, get_player_list),
+	remove_player(Table, Player2),
+	{ok, []} = gen_server:call(Table, get_player_list).	
 	
+stop_test() ->
+	Table = start_link("123", none),
+	ok = stop(Table).
+
+% @private
+notify_test() ->
+	Table = start_link("123", none),
+	Player = test_player,
+	Message = {server, define, "function helloWorld(x) {  }"},
+	ok = notify(Table, Player, Message).
+	%Message2 = {game, "helloWorld", "test"},
+	%ok = notify(Table, Player, Message2).
+	
\ No newline at end of file