diff --git a/.travis.yml b/.travis.yml
index 79c8f0b..591234a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,11 @@ notifications:
   recipients:
     - eduardo@gurgel.me
 elixir:
-  - 1.2.4
+  - 1.2.6
   - 1.3.0
 otp_release:
   - 18.0
   - 18.1
   - 19.0
 sudo: false
-script: mix test --no-start
+script: mix test
diff --git a/lib/httparrot/request_store.ex b/lib/httparrot/request_store.ex
index 5f95d20..d6dbdb6 100644
--- a/lib/httparrot/request_store.ex
+++ b/lib/httparrot/request_store.ex
@@ -1,10 +1,18 @@
 defmodule HTTParrot.RequestStore do
-
+  @moduledoc """
+  Used to store and retrived requests
+  """
+  @doc """
+  Store the requests to the key
+  """
   def store(key, info) do
     map = retrieve(key) ++ [info]
     ConCache.put(:requests_registry, key, map)
   end
 
+  @doc """
+  Get the saved request using the key
+  """
   def retrieve(key) do
     entry = ConCache.get(:requests_registry, key)
     case entry do
@@ -14,6 +22,9 @@ defmodule HTTParrot.RequestStore do
     end
   end
 
+  @doc """
+  Clear the saved data on the coresponding key
+  """
   def clear(key) do
     ConCache.delete(:requests_registry, key)
   end
diff --git a/lib/httparrot/retrieve_request_handler.ex b/lib/httparrot/retrieve_request_handler.ex
index bce4b0e..32bc1fc 100644
--- a/lib/httparrot/retrieve_request_handler.ex
+++ b/lib/httparrot/retrieve_request_handler.ex
@@ -1,6 +1,6 @@
 defmodule HTTParrot.RetrieveRequestHandler do
   @moduledoc """
-  Returns GET data.
+  Retreive saved request and clear the conresponding :id
   """
   alias HTTParrot.GeneralRequestInfo
   use HTTParrot.Cowboy, methods: ~w(GET POST PUT HEAD OPTIONS)
diff --git a/lib/httparrot/store_request_handler.ex b/lib/httparrot/store_request_handler.ex
index 1504b03..def9dd6 100644
--- a/lib/httparrot/store_request_handler.ex
+++ b/lib/httparrot/store_request_handler.ex
@@ -1,6 +1,6 @@
 defmodule HTTParrot.StoreRequestHandler do
   @moduledoc """
-  Returns GET data.
+  Store the sended request with the :id
   """
   alias HTTParrot.GeneralRequestInfo
   use HTTParrot.Cowboy, methods: ~w(GET POST PUT HEAD OPTIONS)
diff --git a/test/request_store_test.exs b/test/request_store_test.exs
new file mode 100644
index 0000000..8c4ac68
--- /dev/null
+++ b/test/request_store_test.exs
@@ -0,0 +1,12 @@
+defmodule HTTParrot.RequestStoreTest do
+  alias HTTParrot.RequestStore
+  use ExUnit.Case
+  test "save, retrieve, clear" do
+    request = %{req: 1}
+    RequestStore.clear(:test)
+    RequestStore.store(:test, request)
+    assert RequestStore.retrieve(:test) == [request]
+     RequestStore.clear(:test)
+    assert RequestStore.retrieve(:test) == []
+  end
+end
diff --git a/test/retrieve_request_handler_tests.exs b/test/retrieve_request_handler_tests.exs
index 5573c77..a582700 100644
--- a/test/retrieve_request_handler_tests.exs
+++ b/test/retrieve_request_handler_tests.exs
@@ -5,13 +5,13 @@ defmodule HTTParrot.RetrieveRequestHandlerTests do
 
   setup do
     HTTParrot.RequestStore.clear(:test)
+    on_exit fn -> unload end
     :ok
   end
 
   test "returns saved requests" do
-    expect(JSX, :encode!, [{[:req1], :json}])
     expect(:cowboy_req, :binding, [:key, :req1], {:test, :req1})
     HTTParrot.RequestStore.store(:test, :req1)
-    assert retrieve_stored(:req1, :state) == {:json, :req1, :state}
+    assert retrieve_stored(:req1, :state) == {"[\"req1\"]", :req1, :state}
   end
 end
diff --git a/test/store_request_handler_test.exs b/test/store_request_handler_test.exs
index af1ba66..d113eeb 100644
--- a/test/store_request_handler_test.exs
+++ b/test/store_request_handler_test.exs
@@ -5,6 +5,7 @@ defmodule HTTParrot.StoreRequestHandlerTests do
 
   setup do
     HTTParrot.RequestStore.clear(:test)
+    on_exit fn -> unload end
     :ok
   end