diff --git a/common/requests.go b/common/requests.go
new file mode 100644
index 0000000..cf4a904
--- /dev/null
+++ b/common/requests.go
@@ -0,0 +1,3 @@
+package common
+
+type KeyModels map[string]interface{}
diff --git a/common/responses.go b/common/responses.go
index ea51a28..fff967d 100644
--- a/common/responses.go
+++ b/common/responses.go
@@ -80,13 +80,13 @@ type ResponseMsg struct {
 	Message string `json:"message"`
 }
 
-type ResponseMsgUsers struct {
-	Users []User `json:"users"`
-}
+//type ResponseMsgUsers struct {
+//Users []User `json:"users"`
+//}
 
-type ResponseMsgUser struct {
-	User `json:"user"`
-}
+//type ResponseMsgUser struct {
+//User `json:"user"`
+//}
 
 type ResponseMsgScenarios struct {
 	Scenarios []ScenarioResponse `json:"scenarios"`
diff --git a/routes/user/user_test.go b/routes/user/user_test.go
index e2fbe69..64293c5 100644
--- a/routes/user/user_test.go
+++ b/routes/user/user_test.go
@@ -11,9 +11,6 @@ import (
 
 func TestUserEndpoints(t *testing.T) {
 
-	myUsers := []common.User{common.User0}
-	msgUsers := common.ResponseMsgUsers{Users: myUsers}
-
 	db := common.DummyInitDB()
 	defer db.Close()
 	common.DummyOnlyAdminDB(db)
@@ -30,12 +27,14 @@ func TestUserEndpoints(t *testing.T) {
 	assert.NoError(t, err)
 
 	// test GET user/
-	err = common.NewTestEndpoint(router, token, "/api/users", "GET",
-		nil, 200, msgUsers)
+	err = common.NewTestEndpoint(router, token,
+		"/api/users", "GET", nil,
+		200, common.KeyModels{"users": []common.User{common.User0}})
 	assert.NoError(t, err)
 
 	// test GET user/1 (the admin)
-	err = common.NewTestEndpoint(router, token, "/api/users/1", "GET",
-		nil, 200, common.ResponseMsgUser{common.User0})
+	err = common.NewTestEndpoint(router, token,
+		"/api/users/1", "GET", nil,
+		200, common.KeyModels{"user": common.User0})
 	assert.NoError(t, err)
 }