diff --git a/.gitignore b/.gitignore
index d176978..f6b93e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.dump
 *.beam
 Mnesia.*
+*.swo
diff --git a/mnesia/gamedb.erl b/mnesia/gamedb.erl
deleted file mode 100644
index 751eb92..0000000
--- a/mnesia/gamedb.erl
+++ /dev/null
@@ -1,50 +0,0 @@
-%%%%----------------------------------------------------
-%%% @author     Mattias Pettersson <mattiaspgames@gmail.com>
-%%% @copyright  2011 Mattias Pettersson
-%%% @doc        Database for runtime game variable storage.
-%%% @end
-
- Test Mnesia
--module(gamedb).
--import(mnesia).
--export([init/0,insert_player/1,example_player/0,read_player/1,test_player/0]).
--include("gamedb.hrl").
-
-%%-----------------------------------------------------
-%% Creation
-%%-----------------------------------------------------
-init() ->
-    mnesia:create_table(player, [{attributes, record_info(fields, player)}]).
-
-%%-----------------------------------------------------
-%% Test
-%%-----------------------------------------------------
-test_player() ->
-    insert_player(example_player()),
-    read_player(0001).
-
-example_player() ->
-    #player{id   = 0001,
-            name = "Tux"}.
-
-%%-----------------------------------------------------
-%% Insertions
-%%-----------------------------------------------------
-insert_player(Player) ->
-    Fun = fun() ->
-                  mnesia:write(Player) 
-          end,
-    mnesia:transaction(Fun).
-
-
-%%-----------------------------------------------------
-%% Querries
-%%-----------------------------------------------------
-read_player(Player_Key) ->
-    Fun = fun() -> 
-                  [P] = mnesia:read(player, Player_Key),
-                  Name = P#player.name,
-                  io:format("Player name: ~s~n",[Name])
-          end,
-    mnesia:transaction(Fun).
-
diff --git a/src/.ggs_connection.erl.swp b/src/.ggs_connection.erl.swp
deleted file mode 100644
index 0c009f8..0000000
Binary files a/src/.ggs_connection.erl.swp and /dev/null differ
diff --git a/src/.ggs_server.erl.swo b/src/.ggs_server.erl.swo
deleted file mode 100644
index 3048659..0000000
Binary files a/src/.ggs_server.erl.swo and /dev/null differ
diff --git a/src/ggs_table.erl b/src/ggs_table.erl
index b2b5c11..4715e79 100644
--- a/src/ggs_table.erl
+++ b/src/ggs_table.erl
@@ -17,7 +17,6 @@
 	 stop/1,
 	 notify/3]).
 
--include_lib("eunit/include/eunit.hrl").
 
 %% ----------------------------------------------------------------------
 % API implementation
@@ -120,80 +119,3 @@ terminate(_Reason, _State) ->
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
-%% @TODO: Please put these tests in a separate file. We can't compile this file if
-%% they contain errors from switching vms
-%% ----------------------------------------------------------------------
-% Tests
-
-%<<<<<<< HEAD
-%start_link_test() ->
-%	Table = start_link(),
-%	?assertNot(Table =:= undefined).
-	
-%add_player_test() ->
-%	Table = start_link(),
-%	Player = test_player,
-%	add_player(Table, Player),
-%	{ok, [Player]} = gen_server:call(Table, get_player_list).
-	
-%remove_player_test() ->
-%	Table = start_link(),
-%	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(),
-%	ok = stop(Table).
-
-% @private
-%notify_test() ->
-%	Table = start_link(),
-%	Player = test_player,
-%	Message = {server, define, "function helloWorld(x) {  }"},
-%	ok = notify(Table, Player, Message).
-%=======
-%%start_link_test() ->
-%	Table = start_link("123", none),
-%	?assertNot(Table =:= undefined).
-%	
-%add_player_test() ->
-%	Table = start_link("123", 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).
-%>>>>>>> jonte_rewrite
-	%Message2 = {game, "helloWorld", "test"},
-	%ok = notify(Table, Player, Message2).
-	
diff --git a/src/js_helper.erl b/src/js_helper.erl
deleted file mode 100644
index efb38f4..0000000
--- a/src/js_helper.erl
+++ /dev/null
@@ -1,8 +0,0 @@
--module(js_helper).
--export([test/0, echo/1]).
-
-test() ->
-	{ok, test}.
-	
-echo(String) ->
-	{ok, String}.
\ No newline at end of file
diff --git a/tests/ggs_table_test.erl b/tests/ggs_table_test.erl
new file mode 100644
index 0000000..5757456
--- /dev/null
+++ b/tests/ggs_table_test.erl
@@ -0,0 +1,44 @@
+-include_lib("eunit/include/eunit.hrl").
+-import(ggs_table).
+
+
+% @private
+start_link_test() ->
+	Table = start_link(),
+	?assertNot(Table =:= undefined).
+
+% @private   
+add_player_test() ->
+	Table = start_link(),
+	Player = test_player,
+	add_player(Table, Player),
+	{ok, [Player]} = gen_server:call(Table, get_player_list).
+
+% @private  
+remove_player_test() ->
+	Table = start_link(),
+	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).	
+
+% @private	
+stop_test() ->
+	Table = start_link(),
+	ok = stop(Table).
+
+% @private
+notify_test() ->
+	Table = start_link(),
+	Player = test_player,
+	Message = {server, define, "function helloWorld(x) {  }"},
+	ok = notify(Table, Player, Message).
+	Message2 = {game, "helloWorld", "test"},
+	ok = notify(Table, Player, Message2).
+