diff --git a/api/server_for_test.go b/api/server_for_test.go
index 77b2607..f3d2ae6 100644
--- a/api/server_for_test.go
+++ b/api/server_for_test.go
@@ -28,6 +28,7 @@ var (
 
 func setup() {
 	store = datastore.NewMockDatastore()
+	SetupCerts("../keys/")
 	resp, _ := httpClient.PostForm(apiClient.BaseURL.String()+"authenticate/",
 		url.Values{"username": {"test_user"}, "password": {"password"}})
 	defer resp.Body.Close()
diff --git a/api/users.go b/api/users.go
index ffd6044..bbd155e 100644
--- a/api/users.go
+++ b/api/users.go
@@ -77,7 +77,7 @@ func serveAuthenticateUser(w http.ResponseWriter, r *http.Request) error {
 	tokenString, err := t.SignedString(signKey)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		return errWhileSigningToken
+		return err
 	}
 
 	http.SetCookie(w, &http.Cookie{