diff --git a/internal/handlers/handlers_test.go b/internal/handlers/handlers_test.go
index 1d32793..20d1118 100644
--- a/internal/handlers/handlers_test.go
+++ b/internal/handlers/handlers_test.go
@@ -3,11 +3,11 @@ package handlers
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"go-udemy-web-1/internal/models"
 	"log"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"strconv"
 	"strings"
 	"testing"
@@ -211,16 +211,10 @@ var postMakeReservationTests = []struct {
 func TestRepository_PostMakeReservation(t *testing.T) {
 	for _, test := range postMakeReservationTests {
 		roomID := 1
-		var reqBody string
+		reqBody := url.Values{}
 		if len(test.reservationInfo) > 0 {
-			if test.reservationInfo[0].key == "room_id" {
-				roomID, _ = strconv.Atoi(test.reservationInfo[0].value)
-			}
-			reqBody = fmt.Sprintf("%s=%s", test.reservationInfo[0].key,
-				test.reservationInfo[0].value)
-			for _, element := range test.reservationInfo[1:] {
-				reqBody = fmt.Sprintf("%s&%s=%s", reqBody, element.key,
-					element.value)
+			for _, element := range test.reservationInfo {
+				reqBody.Add(element.key, element.value)
 				if element.key == "room_id" {
 					roomID, _ = strconv.Atoi(element.value)
 				}
@@ -235,7 +229,7 @@ func TestRepository_PostMakeReservation(t *testing.T) {
 			EndDate:   ed,
 		}
 
-		req, _ := http.NewRequest("POST", "/make-reservation", strings.NewReader(reqBody))
+		req, _ := http.NewRequest("POST", "/make-reservation", strings.NewReader(reqBody.Encode()))
 		ctx := getCtx(req)
 		req = req.WithContext(ctx)
 		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
@@ -323,15 +317,12 @@ var availabilityJSONTests = []struct {
 
 func Test_AvailabilityJSON(t *testing.T) {
 	for _, test := range availabilityJSONTests {
-		var reqBody string
-		reqBody = fmt.Sprintf("%s=%s", test.queryInfo[0].key,
-			test.queryInfo[0].value)
-		for _, element := range test.queryInfo[1:] {
-			reqBody = fmt.Sprintf("%s&%s=%s", reqBody, element.key,
-				element.value)
+		reqBody := url.Values{}
+		for _, element := range test.queryInfo {
+			reqBody.Add(element.key, element.value)
 		}
 
-		req, _ := http.NewRequest("POST", "/make-reservation", strings.NewReader(reqBody))
+		req, _ := http.NewRequest("POST", "/make-reservation", strings.NewReader(reqBody.Encode()))
 		ctx := getCtx(req)
 		req = req.WithContext(ctx)
 		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")