--- a/tests/src/libirccd/command-server-join/main.cpp	Tue Jul 24 22:14:00 2018 +0200
+++ b/tests/src/libirccd/command-server-join/main.cpp	Tue Jul 24 23:01:00 2018 +0200
@@ -45,7 +45,7 @@
 
 BOOST_AUTO_TEST_CASE(basic)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"       },
         { "server",     "test"              },
         { "channel",    "#music"            },
@@ -54,13 +54,14 @@
 
     const auto cmd = server_->find("join").back();
 
+    BOOST_TEST(!code);
     BOOST_TEST(std::any_cast<std::string>(cmd[0]) == "#music");
     BOOST_TEST(std::any_cast<std::string>(cmd[1]) == "plop");
 }
 
 BOOST_AUTO_TEST_CASE(nopassword)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"       },
         { "server",     "test"              },
         { "channel",    "#music"            }
@@ -68,6 +69,7 @@
 
     const auto cmd = server_->find("join").back();
 
+    BOOST_TEST(!code);
     BOOST_TEST(std::any_cast<std::string>(cmd[0]) == "#music");
     BOOST_TEST(std::any_cast<std::string>(cmd[1]) == "");
 }
@@ -76,81 +78,81 @@
 
 BOOST_AUTO_TEST_CASE(invalid_identifier_1)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"   },
         { "server",     123456          },
         { "channel",    "#music"        }
     });
 
-    BOOST_TEST(result.second == server_error::invalid_identifier);
-    BOOST_TEST(result.first["error"].template get<int>() == server_error::invalid_identifier);
-    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "server");
+    BOOST_TEST(code == server_error::invalid_identifier);
+    BOOST_TEST(json["error"].get<int>() == server_error::invalid_identifier);
+    BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_identifier_2)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"   },
         { "server",     ""              },
         { "channel",    "#music"        }
     });
 
-    BOOST_TEST(result.second == server_error::invalid_identifier);
-    BOOST_TEST(result.first["error"].template get<int>() == server_error::invalid_identifier);
-    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "server");
+    BOOST_TEST(code == server_error::invalid_identifier);
+    BOOST_TEST(json["error"].get<int>() == server_error::invalid_identifier);
+    BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_channel_1)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"   },
         { "server",     "test"          },
         { "channel",    ""              }
     });
 
-    BOOST_TEST(result.second == server_error::invalid_channel);
-    BOOST_TEST(result.first["error"].template get<int>() == server_error::invalid_channel);
-    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "server");
+    BOOST_TEST(code == server_error::invalid_channel);
+    BOOST_TEST(json["error"].get<int>() == server_error::invalid_channel);
+    BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_channel_2)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"   },
         { "server",     "test"          },
         { "channel",    123456          }
     });
 
-    BOOST_TEST(result.second == server_error::invalid_channel);
-    BOOST_TEST(result.first["error"].template get<int>() == server_error::invalid_channel);
-    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "server");
+    BOOST_TEST(code == server_error::invalid_channel);
+    BOOST_TEST(json["error"].get<int>() == server_error::invalid_channel);
+    BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(invalid_password)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"   },
         { "server",     "test"          },
         { "channel",    "#staff"        },
         { "password",   123456          }
     });
 
-    BOOST_TEST(result.second == server_error::invalid_password);
-    BOOST_TEST(result.first["error"].template get<int>() == server_error::invalid_password);
-    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "server");
+    BOOST_TEST(code == server_error::invalid_password);
+    BOOST_TEST(json["error"].get<int>() == server_error::invalid_password);
+    BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_CASE(not_found)
 {
-    const auto result = request({
+    const auto [json, code] = request({
         { "command",    "server-join"   },
         { "server",     "unknown"       },
         { "channel",    "#music"        }
     });
 
-    BOOST_TEST(result.second == server_error::not_found);
-    BOOST_TEST(result.first["error"].template get<int>() == server_error::not_found);
-    BOOST_TEST(result.first["errorCategory"].template get<std::string>() == "server");
+    BOOST_TEST(code == server_error::not_found);
+    BOOST_TEST(json["error"].get<int>() == server_error::not_found);
+    BOOST_TEST(json["errorCategory"].get<std::string>() == "server");
 }
 
 BOOST_AUTO_TEST_SUITE_END()