diff --git a/src/DAO/MySQLUserDAO.h b/src/DAO/MySQLUserDAO.h
index 86facf5..b7fac08 100644
--- a/src/DAO/MySQLUserDAO.h
+++ b/src/DAO/MySQLUserDAO.h
@@ -1,3 +1,4 @@
+#pragma once
 #include <mysqlx/xdevapi.h>
 
 #include "IUserDAO.h"
diff --git a/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp b/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
index 6b2d139..0d53714 100644
--- a/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
+++ b/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp
@@ -29,30 +29,14 @@ using RouteAuthRegistrationExecutor = AuthRegistrationExecutor<beast::http::stri
 using Request = boost::beast::http::request<beast::http::string_body,
                                             beast::http::basic_fields<std::allocator<char>>>;
 
-BOOST_AUTO_TEST_CASE(AuthRegistrationExecutor_Failed_Parse_Payload)
+BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Failed_Parse_Payload, F)
 {
-  auto& argv = boost::unit_test::framework::master_test_suite().argv;
-
-  const std::string mysql_credentials = argv[1];
-
-  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
-
-  uad::SetMySqlSession(mysql_session);
-
-  auto user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
-  auto executor = RouteAuthRegistrationExecutor(GetMySqlSession(), user_dao);
-
-  Request req;
-
   req.body() = "{ \"login\": ABS3 }"s;
 
-  BOOST_CHECK_EXCEPTION(executor(std::move(req)), session_exception, [](const session_exception& e) -> bool
+  BOOST_CHECK_EXCEPTION(executor->operator()(std::move(req)), session_exception, [](const session_exception& e) -> bool
   {
     return e.code == beast::http::status::internal_server_error;
   });
-
-  mysql_session->close();
-  delete mysql_session;
 }
 
 BOOST_AUTO_TEST_CASE(AuthRegistrationExecutor_Invalid_Login_Data)
diff --git a/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp b/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp
index d4b188c..487e893 100644
--- a/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp
+++ b/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp
@@ -18,18 +18,17 @@ F::F() :
 {
   uad::SetMySqlSession(mysql_session);
 
-  user_dao = make_shared<MySQLUserDAO>(GetMySqlSession());
-  executor = make_unique<RouteAuthRegistrationExecutor>(GetMySqlSession(), user_dao);
-  BOOST_TEST_MESSAGE("setup fixture");
+  user_dao = std::make_shared<MySQLUserDAO>(GetMySqlSession());
+  executor = std::make_unique<RouteAuthRegistrationExecutor>(GetMySqlSession(), user_dao);
+  BOOST_TEST_MESSAGE("Setup RouteAuthRegistrationExecutor fixture");
 }
 
 F::~F()
 {
-  SetMySqlSession(nullptr);
-  delete mysql_session;
-  mysql_session = nullptr;
-  mysql_credentials = nullptr;
   argv = nullptr;
-  BOOST_TEST_MESSAGE("teardown fixture");
+  mysql_session->close();
+  delete mysql_session;
+
+  BOOST_TEST_MESSAGE("Setup RouteAuthRegistrationExecutor fixture");
 }
 }