diff --git a/exercises/practice/circular-buffer/circular-buffer-test.ys b/exercises/practice/circular-buffer/circular-buffer-test.ys
index 4b3abd1..c4d37eb 100644
--- a/exercises/practice/circular-buffer/circular-buffer-test.ys
+++ b/exercises/practice/circular-buffer/circular-buffer-test.ys
@@ -4,28 +4,6 @@ require ys::taptest: :all
 
 use: circular-buffer
 
-# In general, these circular buffers are expected to be stateful,
-# and each language will operate on them differently.
-# Tests tend to perform a series of operations, some of which expect a certain result.
-# As such, this common test suite can only say in abstract terms what should be done.
-# 
-# Tests will contain a number of operations. The operation will be specified in the `operation` key.
-# Based on the operation, other keys may be present.
-# read: Reading from the buffer should succeed if and only if `should_succeed` is true.
-# If it should succeed, it should produce the item at `expected`.
-# If it should fail, `expected` will not be present.
-# write: Writing the item located at `item` should succeed if and only if `should_succeed` is true.
-# overwrite: Write the item located at `item` into the buffer, replacing the oldest item if necessary.
-# clear: Clear the buffer.
-# 
-# Failure of either `read` or `write` may be indicated in a manner appropriate for your language:
-# Raising an exception, returning (int, error), returning Option<int>, etc.
-# 
-# Finally, note that all values are integers.
-# If your language contains generics, you may consider allowing buffers to contain other types.
-# Tests for that are not included here.
-
-
 test::
 - name: Reading empty buffer should fail
   code: run(1 [{"operation" "read", "should_succeed" false}])
diff --git a/exercises/practice/grains/.meta/grains-test.ys b/exercises/practice/grains/.meta/grains-test.ys
index 3689e14..f82a08b 100644
--- a/exercises/practice/grains/.meta/grains-test.ys
+++ b/exercises/practice/grains/.meta/grains-test.ys
@@ -4,9 +4,6 @@ require ys::taptest: :all
 
 use: grains
 
-# The final tests of square test error conditions
-# In these cases you should expect an error as is idiomatic for your language
-
 test::
 - name: Grains on square 1
   code: square(1)
diff --git a/exercises/practice/grains/grains-test.ys b/exercises/practice/grains/grains-test.ys
index 257d40a..4159748 100644
--- a/exercises/practice/grains/grains-test.ys
+++ b/exercises/practice/grains/grains-test.ys
@@ -4,9 +4,6 @@ require ys::taptest: :all
 
 use: grains
 
-# The final tests of square test error conditions
-# In these cases you should expect an error as is idiomatic for your language
-
 test::
 - name: Grains on square 1
   code: square(1)
diff --git a/exercises/practice/hamming/.meta/hamming-test.ys b/exercises/practice/hamming/.meta/hamming-test.ys
index 3e1930a..b6bf977 100644
--- a/exercises/practice/hamming/.meta/hamming-test.ys
+++ b/exercises/practice/hamming/.meta/hamming-test.ys
@@ -30,26 +30,12 @@ test::
   want: 9
   uuid: cd2273a5-c576-46c8-a52b-dee251c3e6e5
 
-- name: Disallow first strand longer
-  code: distance("AATG" "AAA")
-  what: error
-  # want: left and right strands must be of equal length
-  want: strands must be of equal length
-  uuid: 919f8ef0-b767-4d1b-8516-6379d07fcb28
-
 - name: Disallow first strand longer
   code: distance("AATG" "AAA")
   what: error
   want: strands must be of equal length
   uuid: b9228bb1-465f-4141-b40f-1f99812de5a8
 
-- name: Disallow second strand longer
-  code: distance("ATA" "AGTG")
-  what: error
-  # want: left and right strands must be of equal length
-  want: strands must be of equal length
-  uuid: 8a2d4ed0-ead5-4fdd-924d-27c4cf56e60e
-
 - name: Disallow second strand longer
   code: distance("ATA" "AGTG")
   what: error
@@ -59,14 +45,6 @@ test::
 - name: Disallow left empty strand
   code: distance("" "G")
   what: error
-  # want: left strand must not be empty
-  want: strands must be of equal length
-  uuid: 5dce058b-28d4-4ca7-aa64-adfe4e17784c
-
-- name: Disallow left empty strand
-  code: distance("" "G")
-  what: error
-  # want: left and right strands must be of equal length
   want: strands must be of equal length
   uuid: db92e77e-7c72-499d-8fe6-9354d2bfd504
 
@@ -79,14 +57,6 @@ test::
 - name: Disallow right empty strand
   code: distance("G" "")
   what: error
-  # want: right strand must not be empty
-  want: strands must be of equal length
-  uuid: 38826d4b-16fb-4639-ac3e-ba027dec8b5f
-
-- name: Disallow right empty strand
-  code: distance("G" "")
-  what: error
-  # want: left and right strands must be of equal length
   want: strands must be of equal length
   uuid: 920cd6e3-18f4-4143-b6b8-74270bb8f8a3
 
@@ -96,4 +66,4 @@ test::
   want: strands must be of equal length
   uuid: 9ab9262f-3521-4191-81f5-0ed184a5aa89
 
-done: 15
+done: 11
diff --git a/exercises/practice/hamming/hamming-test.ys b/exercises/practice/hamming/hamming-test.ys
index 9b56319..ca86f85 100644
--- a/exercises/practice/hamming/hamming-test.ys
+++ b/exercises/practice/hamming/hamming-test.ys
@@ -28,18 +28,6 @@ test::
 - name: Disallow first strand longer
   code: distance("AATG" "AAA")
   what: error
-  # want: left and right strands must be of equal length
-  want: strands must be of equal length
-
-- name: Disallow first strand longer
-  code: distance("AATG" "AAA")
-  what: error
-  want: strands must be of equal length
-
-- name: Disallow second strand longer
-  code: distance("ATA" "AGTG")
-  what: error
-  # want: left and right strands must be of equal length
   want: strands must be of equal length
 
 - name: Disallow second strand longer
@@ -50,13 +38,6 @@ test::
 - name: Disallow left empty strand
   code: distance("" "G")
   what: error
-  # want: left strand must not be empty
-  want: strands must be of equal length
-
-- name: Disallow left empty strand
-  code: distance("" "G")
-  what: error
-  # want: left and right strands must be of equal length
   want: strands must be of equal length
 
 - name: Disallow empty first strand
@@ -67,13 +48,6 @@ test::
 - name: Disallow right empty strand
   code: distance("G" "")
   what: error
-  # want: right strand must not be empty
-  want: strands must be of equal length
-
-- name: Disallow right empty strand
-  code: distance("G" "")
-  what: error
-  # want: left and right strands must be of equal length
   want: strands must be of equal length
 
 - name: Disallow empty second strand
@@ -81,4 +55,4 @@ test::
   what: error
   want: strands must be of equal length
 
-done: 15
+done: 11
diff --git a/exercises/practice/largest-series-product/.meta/largest-series-product-test.ys b/exercises/practice/largest-series-product/.meta/largest-series-product-test.ys
index 80b2792..b0b4e7d 100644
--- a/exercises/practice/largest-series-product/.meta/largest-series-product-test.ys
+++ b/exercises/practice/largest-series-product/.meta/largest-series-product-test.ys
@@ -78,17 +78,10 @@ test::
   want: digits input must only contain digits
   uuid: 7a38f2d6-3c35-45f6-8d6f-12e6e32d4d74
 
-- name: Rejects negative span
-  code: largest-product("12345" -1)
-  what: error
-  # want: span must be greater than zero
-  want: span must not be negative
-  uuid: 5fe3c0e5-a945-49f2-b584-f0814b4dd1ef
-
 - name: Rejects negative span
   code: largest-product("12345" -1)
   what: error
   want: span must not be negative
   uuid: c859f34a-9bfe-4897-9c2f-6d7f8598e7f0
 
-done: 16
+done: 15
diff --git a/exercises/practice/largest-series-product/largest-series-product-test.ys b/exercises/practice/largest-series-product/largest-series-product-test.ys
index e83cedd..d2328a4 100644
--- a/exercises/practice/largest-series-product/largest-series-product-test.ys
+++ b/exercises/practice/largest-series-product/largest-series-product-test.ys
@@ -67,12 +67,6 @@ test::
 - name: Rejects negative span
   code: largest-product("12345" -1)
   what: error
-  # want: span must be greater than zero
   want: span must not be negative
 
-- name: Rejects negative span
-  code: largest-product("12345" -1)
-  what: error
-  want: span must not be negative
-
-done: 16
+done: 15
diff --git a/exercises/practice/list-ops/.meta/list-ops-test.ys b/exercises/practice/list-ops/.meta/list-ops-test.ys
index 647b609..dc94a1f 100644
--- a/exercises/practice/list-ops/.meta/list-ops-test.ys
+++ b/exercises/practice/list-ops/.meta/list-ops-test.ys
@@ -4,10 +4,6 @@ require ys::taptest: :all
 
 use: list-ops
 
-# Though there are no specifications here for dealing with large lists,
-# implementers may add tests for handling large lists to ensure that the
-# solutions have thought about performance concerns.
-
 test::
 - name: Empty lists
   code: append([] [])
diff --git a/exercises/practice/list-ops/list-ops-test.ys b/exercises/practice/list-ops/list-ops-test.ys
index 0a9e51d..8ad5a76 100644
--- a/exercises/practice/list-ops/list-ops-test.ys
+++ b/exercises/practice/list-ops/list-ops-test.ys
@@ -4,10 +4,6 @@ require ys::taptest: :all
 
 use: list-ops
 
-# Though there are no specifications here for dealing with large lists,
-# implementers may add tests for handling large lists to ensure that the
-# solutions have thought about performance concerns.
-
 test::
 - name: Empty lists
   code: append([] [])
diff --git a/exercises/practice/nth-prime/nth-prime-test.ys b/exercises/practice/nth-prime/nth-prime-test.ys
index ad3dd80..a52a26d 100644
--- a/exercises/practice/nth-prime/nth-prime-test.ys
+++ b/exercises/practice/nth-prime/nth-prime-test.ys
@@ -18,9 +18,7 @@ test::
   want: 13
 
 - name: Big prime
-  # code: prime(10001)  # Takes 200 ms
-  # want: 104743
-  code: prime(1001)
-  want: 7927
+  code: prime(10001)
+  want: 104743
 
 done: 4
diff --git a/exercises/practice/pascals-triangle/.meta/pascals-triangle-test.ys b/exercises/practice/pascals-triangle/.meta/pascals-triangle-test.ys
index 534b2bf..e0098c6 100644
--- a/exercises/practice/pascals-triangle/.meta/pascals-triangle-test.ys
+++ b/exercises/practice/pascals-triangle/.meta/pascals-triangle-test.ys
@@ -4,9 +4,6 @@ require ys::taptest: :all
 
 use: pascals-triangle
 
-# Expectations are represented here as an array of arrays.
-# How you represent this idiomatically in your language is up to you.
-
 test::
 - name: Zero rows
   code: rows(0)
diff --git a/exercises/practice/pascals-triangle/pascals-triangle-test.ys b/exercises/practice/pascals-triangle/pascals-triangle-test.ys
index be87896..cd87b2e 100644
--- a/exercises/practice/pascals-triangle/pascals-triangle-test.ys
+++ b/exercises/practice/pascals-triangle/pascals-triangle-test.ys
@@ -4,9 +4,6 @@ require ys::taptest: :all
 
 use: pascals-triangle
 
-# Expectations are represented here as an array of arrays.
-# How you represent this idiomatically in your language is up to you.
-
 test::
 - name: Zero rows
   code: rows(0)
diff --git a/exercises/practice/perfect-numbers/perfect-numbers-test.ys b/exercises/practice/perfect-numbers/perfect-numbers-test.ys
index 6b8d748..3317cec 100644
--- a/exercises/practice/perfect-numbers/perfect-numbers-test.ys
+++ b/exercises/practice/perfect-numbers/perfect-numbers-test.ys
@@ -16,7 +16,6 @@ test::
 - name: Large perfect number is classified correctly
   code: classify(33550336)
   want: perfect
-  SKIP: true   # SLOW
 
 - name: Smallest abundant number is classified correctly
   code: classify(12)
@@ -29,7 +28,6 @@ test::
 - name: Large abundant number is classified correctly
   code: classify(33550335)
   want: abundant
-  SKIP: true   # SLOW
 
 - name: Smallest prime deficient number is classified correctly
   code: classify(2)
@@ -46,7 +44,6 @@ test::
 - name: Large deficient number is classified correctly
   code: classify(33550337)
   want: deficient
-  SKIP: true   # SLOW
 
 - name: Edge case (no factors other than itself) is classified correctly
   code: classify(1)
@@ -62,4 +59,4 @@ test::
   what: error
   want: Classification is only possible for positive integers.
 
-done: 10 # 13
+done: 13