diff --git a/CalculatorCliTests.cpp b/CalculatorCliTests.cpp
index 1a80d65..c591ebd 100644
--- a/CalculatorCliTests.cpp
+++ b/CalculatorCliTests.cpp
@@ -17,14 +17,28 @@ TEST_CASE("CalculatorCli - can parse operations", "[calculator-challenge]")
 
     calculator.parse("a =   4 +      1");
     CHECK(calculator.parse("result") == "a = 5");
+
+    calculator.parse("a =   42 +      1");
+    CHECK(calculator.parse("result") == "a = 43");
+
+    calculator.parse("d =   t +      2");
+    calculator.parse("t =   1 +      9");
+    calculator.parse("e =   d +      d");
+    CHECK(calculator.parse("result") == "e = 24");
 }
 
 TEST_CASE("CalculatorCli - edge cases", "[calculator-challenge]")
 {
     CalculatorCli calculator;
 
-    calculator.parse("a=31+2");
-    CHECK_FALSE(calculator.parse("result") == "a = 33");  // TODO: @JC do not require spaces
+    calculator.parse("a=31 + 2");
+    CHECK(calculator.parse("result") == "a = 33");
+
+    calculator.parse("b= 31+ 2");
+    CHECK_FALSE(calculator.parse("result") == "b = 33");
+
+    calculator.parse("c= 31 +2");
+    CHECK_FALSE(calculator.parse("result") == "c = 33");  // TODO: @JC do not require spaces
 }
 
 TEST_CASE("CalculatorCli - can undo operations", "[calculator-challenge]")