--- a/tests/libclient/js-size/main.cpp	Sun Nov 27 20:50:38 2016 +0100
+++ b/tests/libclient/js-size/main.cpp	Tue Nov 29 21:21:36 2016 +0100
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include <malikania/js-size.hpp>
+#include <malikania/js_size.hpp>
 
 using namespace malikania;
 
@@ -49,8 +49,9 @@
             "h = s.height;"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "w");
         ASSERT_EQ(0U, duk_to_uint(m_ctx, -1));
@@ -72,8 +73,9 @@
             "h = s.height;"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "w");
         ASSERT_EQ(100U, duk_to_uint(m_ctx, -1));
@@ -95,8 +97,9 @@
             "h = s.height;"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "w");
         ASSERT_EQ(100U, duk_to_uint(m_ctx, -1));
@@ -118,8 +121,9 @@
             "h = s.height;"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "w");
         ASSERT_EQ(100U, duk_to_uint(m_ctx, -1));
@@ -149,8 +153,9 @@
             "}"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "name");
         ASSERT_STREQ("TypeError", duk_to_string(m_ctx, -1));
@@ -175,8 +180,9 @@
             "}"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "name");
         ASSERT_STREQ("RangeError", duk_to_string(m_ctx, -1));
@@ -201,8 +207,9 @@
             "}"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "name");
         ASSERT_STREQ("RangeError", duk_to_string(m_ctx, -1));
@@ -227,8 +234,9 @@
             "}"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "name");
         ASSERT_STREQ("RangeError", duk_to_string(m_ctx, -1));
@@ -253,8 +261,9 @@
             "}"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "name");
         ASSERT_STREQ("RangeError", duk_to_string(m_ctx, -1));
@@ -276,7 +285,7 @@
 {
     try {
         duk_push_c_function(m_ctx, [] (auto ctx) {
-            Size size = dukx_require_size(ctx, 0);
+            auto size = dukx_require_size(ctx, 0);
 
             duk_push_uint(ctx, size.width());
             duk_put_global_string(ctx, "w");
@@ -289,8 +298,9 @@
 
         auto ret = duk_peval_string(m_ctx, "build({ width: 100, height: 200 });");
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "w");
         ASSERT_EQ(100U, duk_to_uint(m_ctx, -1));
@@ -322,8 +332,9 @@
             "}"
         );
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "name");
         ASSERT_STREQ("Error", duk_to_string(m_ctx, -1));
@@ -345,7 +356,7 @@
 {
     try {
         duk_push_c_function(m_ctx, [] (auto ctx) {
-            Size size = dukx_get_size(ctx, 0);
+            auto size = dukx_get_size(ctx, 0);
 
             duk_push_uint(ctx, size.width());
             duk_put_global_string(ctx, "w");
@@ -358,8 +369,9 @@
 
         auto ret = duk_peval_string(m_ctx, "build({});");
 
-        if (ret != 0)
+        if (ret != 0) {
             throw dukx_exception(m_ctx, -1);
+        }
 
         duk_get_global_string(m_ctx, "w");
         ASSERT_EQ(0U, duk_to_uint(m_ctx, -1));