diff --git a/test/StaticJsonBufferTests.cpp b/test/StaticJsonBuffer_Object_Tests.cpp
similarity index 69%
rename from test/StaticJsonBufferTests.cpp
rename to test/StaticJsonBuffer_Object_Tests.cpp
index 1682d615..29722e97 100644
--- a/test/StaticJsonBufferTests.cpp
+++ b/test/StaticJsonBuffer_Object_Tests.cpp
@@ -6,7 +6,6 @@
 
 #include <gtest/gtest.h>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 
 using namespace ArduinoJson;
@@ -16,19 +15,19 @@ const size_t SIZEOF_TWO_OBJECTS = 2 * SIZEOF_ONE_OBJECT;
 const size_t SIZEOF_OBJECT_WITH_ONE_VALUE = JSON_OBJECT_SIZE(1);
 const size_t SIZEOF_OBJECT_WITH_TWO_VALUES = JSON_OBJECT_SIZE(2);
 
-TEST(StaticJsonBuffer, CapacityMatchTemplateParameter) {
+TEST(StaticJsonBuffer_Object_Tests, CapacityMatchTemplateParameter) {
   StaticJsonBuffer<42> json;
 
   EXPECT_EQ(42, json.capacity());
 }
 
-TEST(StaticJsonBuffer, InitialSizeIsZero) {
+TEST(StaticJsonBuffer_Object_Tests, InitialSizeIsZero) {
   StaticJsonBuffer<42> json;
 
   EXPECT_EQ(0, json.size());
 }
 
-TEST(StaticJsonBuffer,
+TEST(StaticJsonBuffer_Object_Tests,
      WhenCreateObjectIsCalled_ThenSizeIsIncreasedSizeOfJsonObject) {
   StaticJsonBuffer<SIZEOF_TWO_OBJECTS> json;
 
@@ -37,7 +36,7 @@ TEST(StaticJsonBuffer,
   EXPECT_EQ(SIZEOF_TWO_OBJECTS, json.size());
 }
 
-TEST(StaticJsonBuffer,
+TEST(StaticJsonBuffer_Object_Tests,
      GivenBufferIsFull_WhenCreateObjectIsCalled_ThenSizeDoesNotChange) {
   StaticJsonBuffer<SIZEOF_ONE_OBJECT> json;
 
@@ -46,7 +45,23 @@ TEST(StaticJsonBuffer,
   EXPECT_EQ(SIZEOF_ONE_OBJECT, json.size());
 }
 
-TEST(StaticJsonBuffer,
+TEST(StaticJsonBuffer_Object_Tests,
+     GivenEnoughSpace_WhenCreateObjectIsCalled_ThenSuccessIsTrue) {
+  StaticJsonBuffer<SIZEOF_ONE_OBJECT> json;
+
+  JsonObject &object = json.createObject();
+  EXPECT_TRUE(object.success());
+}
+
+TEST(StaticJsonBuffer_Object_Tests,
+     GivenNotEnoughSpace_WhenCreateObjectIsCalled_ThenSuccessIsFalse) {
+  StaticJsonBuffer<SIZEOF_ONE_OBJECT - 1> json;
+
+  JsonObject &object = json.createObject();
+  EXPECT_FALSE(object.success());
+}
+
+TEST(StaticJsonBuffer_Object_Tests,
      WhenCreateObjectIsCalled_ThenAnEmptyJsonObjectIsReturned) {
   StaticJsonBuffer<SIZEOF_ONE_OBJECT> json;
 
@@ -55,7 +70,7 @@ TEST(StaticJsonBuffer,
   EXPECT_EQ(0, obj.size());
 }
 
-TEST(StaticJsonBuffer,
+TEST(StaticJsonBuffer_Object_Tests,
      GivenAJsonObject_WhenValuesAreAdded_ThenSizeIsIncreasedAccordingly) {
   StaticJsonBuffer<SIZEOF_OBJECT_WITH_TWO_VALUES> json;
 
@@ -67,7 +82,7 @@ TEST(StaticJsonBuffer,
 }
 
 TEST(
-    StaticJsonBuffer,
+    StaticJsonBuffer_Object_Tests,
     GivenAJsonObject_WhenSameValuesAreAddedTwice_ThenSizeIsOnlyIncreasedByTwo) {
   StaticJsonBuffer<SIZEOF_OBJECT_WITH_TWO_VALUES> json;