diff --git a/Test/BaseX_2_Y.cpp b/Test/BaseX_2_Y.cpp
index a432d5b..78689f3 100644
--- a/Test/BaseX_2_Y.cpp
+++ b/Test/BaseX_2_Y.cpp
@@ -81,6 +81,22 @@ TEST_CASE(__FILE__"/Base16_to_2", "[BaseX_2_Y]")
     REQUIRE(out == expected_out);
 }
 
+// Tests base 16 to fucking big
+TEST_CASE(__FILE__"/Base16_to_FuckingBig", "[Base10_2_X]")
+{
+    // Setup
+    const std::string set_in  = "0123456789abcdef";
+    const std::string set_out = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    const std::string in = "2091f258";
+    const std::string expected_out = "aymsa";
+
+    // Exercise
+    const std::string out = GeneralUtility::BaseX_2_Y(in, set_in, set_out);
+
+    // Verify
+    REQUIRE(out == expected_out);
+}
+
 // Tests that padding works
 TEST_CASE(__FILE__"/TestPadding_ResultSmallEnough", "[BaseX_2_Y]")
 {
@@ -112,3 +128,48 @@ TEST_CASE(__FILE__"/TestPadding_ResultLargerThanPad", "[BaseX_2_Y]")
     // Verify
     REQUIRE(out == expected_out);
 }
+
+// Tests that BaseX_2_Y is not limited by integer boundaries
+TEST_CASE(__FILE__"/NotLimitedByIntegerLimits", "[BaseX_2_Y]")
+{
+    // So what we're doing is the following:
+    // 1) Store a 4096-bit integer in a string (hex)
+    // 2) Convert that to base62
+    // 3) Convert the base62 number back to hex
+    // 4) Check if the strings are equal
+    //
+    // If we have integer limitations, the result should differ.
+
+    // Setup
+    const std::string set_hex  = "0123456789ABCDEF";
+    const std::string set_base62 = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+    // Create a 4096-bit number
+    const std::string hex_initial =
+       "655468576D5A7134743777397A24432646294A404E635266556A586E32723575"
+       "38782F4125442A472D4B6150645367566B59703373367639792442264528482B"
+       "4D6251655468576D5A7134743777217A25432A462D4A404E635266556A586E32"
+       "72357538782F413F4428472B4B6250645367566B597033733676397924422645"
+       "2948404D6351665468576D5A7134743777217A25432A462D4A614E645267556B"
+       "586E3272357538782F413F4428472B4B6250655368566D597133733676397924"
+       "4226452948404D635166546A576E5A7234753777217A25432A462D4A614E6452"
+       "67556B58703273357638792F413F4428472B4B6250655368566D597133743677"
+       "397A244326452948404D635166546A576E5A7234753778214125442A472D4B61"
+       "4E645267556B58703273357638792F423F4528482B4D6251655368566D597133"
+       "743677397A24432646294A404E635266556A576E5A7234753778214125442A47"
+       "2D4B6150645367566B59703273357638792F423F4528482B4D6251655468576D"
+       "5A7134743677397A24432646294A404E635266556A586E327235753878214125"
+       "442A472D4B6150645367566B597033733676397924423F4528482B4D62516554"
+       "68576D5A7134743777217A25432A46294A404E635266556A586E327235753878"
+       "2F413F4428472B4B6150645367566B5970337336763979244226452948404D63"
+    ;
+
+    // Convert to base62
+    const std::string base62 = GeneralUtility::BaseX_2_Y(hex_initial, set_hex, set_base62);
+
+    // Convert back to hex
+    const std::string hex_convertedBack = GeneralUtility::BaseX_2_Y(base62, set_base62, set_hex);
+
+    // Verify that hex_initial equals hex_converted
+    REQUIRE(hex_initial == hex_convertedBack);
+}