diff --git a/exercises/practice/two-bucket/.meta/tests.toml b/exercises/practice/two-bucket/.meta/tests.toml
index d6ff02f5..a3fe533e 100644
--- a/exercises/practice/two-bucket/.meta/tests.toml
+++ b/exercises/practice/two-bucket/.meta/tests.toml
@@ -27,6 +27,12 @@ description = "Measure one step using bucket one of size 1 and bucket two of siz
 [eb329c63-5540-4735-b30b-97f7f4df0f84]
 description = "Measure using bucket one of size 2 and bucket two of size 3 - start with bucket one and end with bucket two"
 
+[58d70152-bf2b-46bb-ad54-be58ebe94c03]
+description = "Measure using bucket one much bigger than bucket two"
+
+[9dbe6499-caa5-4a58-b5ce-c988d71b8981]
+description = "Measure using bucket one much smaller than bucket two"
+
 [449be72d-b10a-4f4b-a959-ca741e333b72]
 description = "Not possible to reach the goal"
 
diff --git a/exercises/practice/two-bucket/two-bucket-test.el b/exercises/practice/two-bucket/two-bucket-test.el
index 8fda0003..3f4c7bf4 100644
--- a/exercises/practice/two-bucket/two-bucket-test.el
+++ b/exercises/practice/two-bucket/two-bucket-test.el
@@ -10,68 +10,48 @@
 
 
 (ert-deftest measure-using-bucket-one-of-size-3-and-bucket-two-of-size-5-start-with-bucket-one ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":3,"bucketTwo":5,"goal":1,"startBucket":"one"}
-  ;; Expected: {"moves":4,"goalBucket":"one","otherBucket":5}
   (should (equal (measure 3 5 1 'one) '(4 one 5))))
 
 
 (ert-deftest measure-using-bucket-one-of-size-3-and-bucket-two-of-size-5-start-with-bucket-two ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":3,"bucketTwo":5,"goal":1,"startBucket":"two"}
-  ;; Expected: {"moves":8,"goalBucket":"two","otherBucket":3}
   (should (equal (measure 3 5 1 'two) '(8 two 3))))
 
 
 (ert-deftest measure-using-bucket-one-of-size-7-and-bucket-two-of-size-11-start-with-bucket-one ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":7,"bucketTwo":11,"goal":2,"startBucket":"one"}
-  ;; Expected: {"moves":14,"goalBucket":"one","otherBucket":11}
   (should (equal (measure 7 11 2 'one) '(14 one 11))))
 
 
 (ert-deftest measure-using-bucket-one-of-size-7-and-bucket-two-of-size-11-start-with-bucket-two ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":7,"bucketTwo":11,"goal":2,"startBucket":"two"}
-  ;; Expected: {"moves":18,"goalBucket":"two","otherBucket":7}
   (should (equal (measure 7 11 2 'two) '(18 two 7))))
 
 
 (ert-deftest measure-one-step-using-bucket-one-of-size-1-and-bucket-two-of-size-3-start-with-bucket-two ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":1,"bucketTwo":3,"goal":3,"startBucket":"two"}
-  ;; Expected: {"moves":1,"goalBucket":"two","otherBucket":0}
   (should (equal (measure 1 3 3 'two) '(1 two 0))))
 
 
 (ert-deftest measure-using-bucket-one-of-size-2-and-bucket-two-of-size-3-start-with-bucket-one-and-end-with-bucket-two ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":2,"bucketTwo":3,"goal":3,"startBucket":"one"}
-  ;; Expected: {"moves":2,"goalBucket":"two","otherBucket":2}
   (should (equal (measure 2 3 3 'one) '(2 two 2))))
 
 
+(ert-deftest measure-using-bucket-one-much-bigger-than-bucket-two ()
+  (should (equal (measure 5 1 2 'one) '(6 one 1))))
+
+
+(ert-deftest measure-using-bucket-one-much-smaller-than-bucket-two ()
+  (should (equal (measure 3 15 9 'one) '(6 two 0))))
+
+
 (ert-deftest not-possible-to-reach-the-goal ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":6,"bucketTwo":15,"goal":5,"startBucket":"one"}
-  ;; Expected: {"error":"impossible"}
   (should-error (measure 6 15 5 'one) :type 'goal-not-possible))
 
 
 (ert-deftest with-the-same-buckets-but-a-different-goal-then-it-is-possible ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":6,"bucketTwo":15,"goal":9,"startBucket":"one"}
-  ;; Expected: {"moves":10,"goalBucket":"two","otherBucket":0}
   (should (equal (measure 6 15 9 'one) '(10 two 0))))
 
 
 (ert-deftest goal-larger-than-both-buckets-is-impossible ()
-  ;; Function under test: measure
-  ;; Input: {"bucketOne":5,"bucketTwo":7,"goal":8,"startBucket":"one"}
-  ;; Expected: {"error":"impossible"}
   (should-error (measure 5 7 8 'one) :type 'goal-not-possible))
 
 
 (provide 'two-bucket-test)
 ;;; two-bucket-test.el ends here
-