diff --git a/test/Big.cpp b/test/Big.cpp
index cd924e4..7902b31 100644
--- a/test/Big.cpp
+++ b/test/Big.cpp
@@ -1,5 +1,6 @@
 #include "storm/Big.hpp"
 #include "test/Test.hpp"
+#include "test/big/BigDataTest.hpp"
 #include <string>
 
 TEST_CASE("SBigAdd", "[big]") {
@@ -570,7 +571,7 @@ TEST_CASE("SBigNot", "[big]") {
 
     SECTION("bitwise negates huge value") {
         uint32_t data[] = { 0xF00DFEED, 0xBA1D, 0xBEEBBEEB, 0x12345678, 0x9ABCDEF, 0xDEADCAD, 0xD011A };
-        
+
         SBigFromBinary(b, data, sizeof(data));
         SBigNot(a, b);
 
diff --git a/test/Test.cpp b/test/Test.cpp
index 9f59f24..14d382f 100644
--- a/test/Test.cpp
+++ b/test/Test.cpp
@@ -1,8 +1,2 @@
 #define CATCH_CONFIG_MAIN
 #include "test/Test.hpp"
-#include "storm/Big.hpp"
-
-
-BigDataTest::BigDataTest() { SBigNew(&num); }
-BigDataTest::~BigDataTest() { SBigDel(num); }
-
diff --git a/test/big/Ops.cpp b/test/big/Ops.cpp
index 935c060..3e9bd3f 100644
--- a/test/big/Ops.cpp
+++ b/test/big/Ops.cpp
@@ -1,6 +1,7 @@
 #include "storm/Big.hpp"
 #include "storm/big/Ops.hpp"
 #include "test/Test.hpp"
+#include "test/big/BigDataTest.hpp"
 #include <vector>
 
 TEST_CASE("Add", "[big]") {
@@ -115,7 +116,7 @@ TEST_CASE("Compare", "[big]") {
 
     SECTION("compares 0x11111111 and 0x2222222222222222") {
         SBigFromUnsigned(a, 0x11111111);
-        
+
         uint64_t data = 0x2222222222222222;
         SBigFromBinary(b, reinterpret_cast<uint8_t*>(&data), sizeof(data));
 
@@ -690,7 +691,7 @@ TEST_CASE("SetOne", "[big]") {
 
 TEST_CASE("SetZero", "[big]") {
     BigDataTest num;
-    
+
     SECTION("sets buffer to zero") {
         SBigFromUnsigned(num, 0x12345678);