diff --git a/internal/server/data/state_test.go b/internal/server/data/state_test.go
index a954847..3cc9dbb 100644
--- a/internal/server/data/state_test.go
+++ b/internal/server/data/state_test.go
@@ -3,20 +3,27 @@
 package data
 
 import (
+	"reflect"
 	"testing"
 	"time"
 
 	"github.com/BBVA/kapow/internal/server/model"
 )
 
-func TestNewShouldReturnAnEmptyStruct(t *testing.T) {
+func TestNewReturnAnEmptyStruct(t *testing.T) {
 	shm := New()
 
-	if len(shm.hs) > 0 {
+	if len(shm.hs) != 0 {
 		t.Error("Unexpected member in map")
 	}
 }
 
+func TestPackageHaveASingletonEmptyHandlersList(t *testing.T) {
+	if !reflect.DeepEqual(Handlers, New()) {
+		t.Error("Handlers is not an empty safeHandlerMap")
+	}
+}
+
 func TestAddAddsANewHandlerToTheMap(t *testing.T) {
 	shm := New()