diff --git a/exercises/practice/bob/.meta/tests.toml b/exercises/practice/bob/.meta/tests.toml
index 5299e289..c6a46496 100644
--- a/exercises/practice/bob/.meta/tests.toml
+++ b/exercises/practice/bob/.meta/tests.toml
@@ -9,17 +9,20 @@
 # As user-added comments (using the # character) will be removed when this file
 # is regenerated, comments can be added via a `comment` key.
 
-[e162fead-606f-437a-a166-d051915cea8e]
-description = "stating something"
+[8a2e771d-d6f1-4e3f-b6c6-b41495556e37]
+description = "asking a question"
 
 [73a966dc-8017-47d6-bb32-cf07d1a5fcd9]
 description = "shouting"
 
-[d6c98afd-df35-4806-b55e-2c457c3ab748]
-description = "shouting gibberish"
+[a5193c61-4a92-4f68-93e2-f554eb385ec6]
+description = "forceful question"
 
-[8a2e771d-d6f1-4e3f-b6c6-b41495556e37]
-description = "asking a question"
+[bc39f7c6-f543-41be-9a43-fd1c2f753fc0]
+description = "silence"
+
+[e162fead-606f-437a-a166-d051915cea8e]
+description = "stating something"
 
 [81080c62-4e4d-4066-b30a-48d8d76920d9]
 description = "asking a numeric question"
@@ -27,23 +30,34 @@ description = "asking a numeric question"
 [2a02716d-685b-4e2e-a804-2adaf281c01e]
 description = "asking gibberish"
 
-[c02f9179-ab16-4aa7-a8dc-940145c385f7]
-description = "talking forcefully"
+[bb0011c5-cd52-4a5b-8bfb-a87b6283b0e2]
+description = "question with no letters"
 
-[153c0e25-9bb5-4ec5-966e-598463658bcd]
-description = "using acronyms in regular speech"
+[9bfc677d-ea3a-45f2-be44-35bc8fa3753e]
+description = "non-letters with question"
 
-[a5193c61-4a92-4f68-93e2-f554eb385ec6]
-description = "forceful question"
+[8608c508-f7de-4b17-985b-811878b3cf45]
+description = "prattling on"
 
-[a20e0c54-2224-4dde-8b10-bd2cdd4f61bc]
-description = "shouting numbers"
+[05b304d6-f83b-46e7-81e0-4cd3ca647900]
+description = "ending with whitespace"
 
-[f7bc4b92-bdff-421e-a238-ae97f230ccac]
-description = "no letters"
+[66953780-165b-4e7e-8ce3-4bcb80b6385a]
+description = "multiple line question"
+include = false
 
-[bb0011c5-cd52-4a5b-8bfb-a87b6283b0e2]
-description = "question with no letters"
+[2c7278ac-f955-4eb4-bf8f-e33eb4116a15]
+description = "multiple line question"
+reimplements = "66953780-165b-4e7e-8ce3-4bcb80b6385a"
+
+[d6c98afd-df35-4806-b55e-2c457c3ab748]
+description = "shouting gibberish"
+
+[3c954328-86fb-4c71-8961-e18d6a5e2517]
+description = "shouting a statement containing a question mark"
+
+[a20e0c54-2224-4dde-8b10-bd2cdd4f61bc]
+description = "shouting numbers"
 
 [496143c8-1c31-4c01-8a08-88427af85c66]
 description = "shouting with special characters"
@@ -51,40 +65,29 @@ description = "shouting with special characters"
 [e6793c1c-43bd-4b8d-bc11-499aea73925f]
 description = "shouting with no exclamation mark"
 
-[aa8097cc-c548-4951-8856-14a404dd236a]
-description = "statement containing question mark"
-
-[9bfc677d-ea3a-45f2-be44-35bc8fa3753e]
-description = "non-letters with question"
-
-[8608c508-f7de-4b17-985b-811878b3cf45]
-description = "prattling on"
-
-[bc39f7c6-f543-41be-9a43-fd1c2f753fc0]
-description = "silence"
-
 [d6c47565-372b-4b09-b1dd-c40552b8378b]
 description = "prolonged silence"
 
 [4428f28d-4100-4d85-a902-e5a78cb0ecd3]
 description = "alternate silence"
 
-[66953780-165b-4e7e-8ce3-4bcb80b6385a]
-description = "multiple line question"
-include = false
+[72bd5ad3-9b2f-4931-a988-dce1f5771de2]
+description = "other whitespace"
 
-[5371ef75-d9ea-4103-bcfa-2da973ddec1b]
-description = "starting with whitespace"
+[c02f9179-ab16-4aa7-a8dc-940145c385f7]
+description = "talking forcefully"
 
-[05b304d6-f83b-46e7-81e0-4cd3ca647900]
-description = "ending with whitespace"
+[153c0e25-9bb5-4ec5-966e-598463658bcd]
+description = "using acronyms in regular speech"
 
-[72bd5ad3-9b2f-4931-a988-dce1f5771de2]
-description = "other whitespace"
+[f7bc4b92-bdff-421e-a238-ae97f230ccac]
+description = "no letters"
+
+[aa8097cc-c548-4951-8856-14a404dd236a]
+description = "statement containing question mark"
+
+[5371ef75-d9ea-4103-bcfa-2da973ddec1b]
+description = "starting with whitespace"
 
 [12983553-8601-46a8-92fa-fcaa3bc4a2a0]
 description = "non-question ending with whitespace"
-
-[2c7278ac-f955-4eb4-bf8f-e33eb4116a15]
-description = "multiple line question"
-reimplements = "66953780-165b-4e7e-8ce3-4bcb80b6385a"
diff --git a/exercises/practice/bob/bob.spec.coffee b/exercises/practice/bob/bob.spec.coffee
index 3823ac23..086322bd 100644
--- a/exercises/practice/bob/bob.spec.coffee
+++ b/exercises/practice/bob/bob.spec.coffee
@@ -2,21 +2,25 @@ Bob = require './bob'
 
 describe 'Bob', ->
   bob = new Bob()
-  it 'stating something', ->
-    result = bob.hey 'Tom-ay-to, tom-aaaah-to.'
-    expect(result).toEqual 'Whatever.'
+  it 'asking a question', ->
+    result = bob.hey 'Does this cryogenic chamber make me look fat?'
+    expect(result).toEqual 'Sure.'
 
   xit 'shouting', ->
     result = bob.hey 'WATCH OUT!'
     expect(result).toEqual 'Whoa, chill out!'
 
-  xit 'shouting gibberish', ->
-    result = bob.hey 'FCECDFCAAB'
-    expect(result).toEqual 'Whoa, chill out!'
+  xit 'forceful question', ->
+    result = bob.hey "WHAT'S GOING ON?"
+    expect(result).toEqual "Calm down, I know what I'm doing!"
 
-  xit 'asking a question', ->
-    result = bob.hey 'Does this cryogenic chamber make me look fat?'
-    expect(result).toEqual 'Sure.'
+  xit 'silence', ->
+    result = bob.hey ''
+    expect(result).toEqual 'Fine. Be that way!'
+
+  xit 'stating something', ->
+    result = bob.hey 'Tom-ay-to, tom-aaaah-to.'
+    expect(result).toEqual 'Whatever.'
 
   xit 'asking a numeric question', ->
     result = bob.hey 'You are, what, like 15?'
@@ -26,77 +30,77 @@ describe 'Bob', ->
     result = bob.hey 'fffbbcbeab?'
     expect(result).toEqual 'Sure.'
 
-  xit 'talking forcefully', ->
-    result = bob.hey 'Hi there!'
-    expect(result).toEqual 'Whatever.'
+  xit 'question with no letters', ->
+    result = bob.hey '4?'
+    expect(result).toEqual 'Sure.'
 
-  xit 'using acronyms in regular speech', ->
-    result = bob.hey "It's OK if you don't want to go work for NASA."
-    expect(result).toEqual 'Whatever.'
+  xit 'non-letters with question', ->
+    result = bob.hey ':) ?'
+    expect(result).toEqual 'Sure.'
 
-  xit 'forceful question', ->
-    result = bob.hey "WHAT'S GOING ON?"
-    expect(result).toEqual "Calm down, I know what I'm doing!"
+  xit 'prattling on', ->
+    result = bob.hey 'Wait! Hang on. Are you going to be OK?'
+    expect(result).toEqual 'Sure.'
 
-  xit 'shouting numbers', ->
-    result = bob.hey '1, 2, 3 GO!'
+  xit 'ending with whitespace', ->
+    result = bob.hey 'Okay if like my  spacebar  quite a bit?   '
+    expect(result).toEqual 'Sure.'
+
+  xit 'multiple line question', ->
+    result = bob.hey "\nDoes this cryogenic chamber make\n me look fat?"
+    expect(result).toEqual 'Sure.'
+
+  xit 'shouting gibberish', ->
+    result = bob.hey 'FCECDFCAAB'
     expect(result).toEqual 'Whoa, chill out!'
 
-  xit 'no letters', ->
-    result = bob.hey '1, 2, 3'
-    expect(result).toEqual 'Whatever.'
+  xit 'shouting a statement containing a question mark', ->
+    result = bob.hey 'DO LIONS EAT PEOPLE? AHHHHH.'
+    expect(result).toEqual 'Whoa, chill out!'
 
-  xit 'question with no letters', ->
-    result = bob.hey '4?'
-    expect(result).toEqual 'Sure.'
+  xit 'shouting numbers', ->
+    result = bob.hey '1, 2, 3 GO!'
+    expect(result).toEqual 'Whoa, chill out!'
 
   xit 'shouting with special characters', ->
-    result = bob.hey 'ZOMG THE %^*@ #$(*^ ZOMBIES ARE COMING!!11!!1!'
+    result = bob.hey 'ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!'
     expect(result).toEqual 'Whoa, chill out!'
 
   xit 'shouting with no exclamation mark', ->
     result = bob.hey 'I HATE THE DENTIST'
     expect(result).toEqual 'Whoa, chill out!'
 
-  xit 'statement containing question mark', ->
-    result = bob.hey 'Ending with ? means a question.'
-    expect(result).toEqual 'Whatever.'
-
-  xit 'non-letters with question', ->
-    result = bob.hey ':) ?'
-    expect(result).toEqual 'Sure.'
-
-  xit 'prattling on', ->
-    result = bob.hey 'Wait! Hang on. Are you going to be OK?'
-    expect(result).toEqual 'Sure.'
-
-  xit 'silence', ->
-    result = bob.hey ''
-    expect(result).toEqual 'Fine. Be that way!'
-
   xit 'prolonged silence', ->
     result = bob.hey '          '
     expect(result).toEqual 'Fine. Be that way!'
 
   xit 'alternate silence', ->
-    result = bob.hey '\t\t\t\t\t\t\t\t\t\t'
+    result = bob.hey "\t\t\t\t\t\t\t\t\t\t"
     expect(result).toEqual 'Fine. Be that way!'
 
-  xit 'multiple line question', ->
-    result = bob.hey "\nDoes this cryogenic chamber make\n me look fat?"
-    expect(result).toEqual 'Sure.'
+  xit 'other whitespace', ->
+    result = bob.hey "\n\r \t"
+    expect(result).toEqual 'Fine. Be that way!'
 
-  xit 'starting with whitespace', ->
-    result = bob.hey '         hmmmmmmm...'
+  xit 'talking forcefully', ->
+    result = bob.hey 'Hi there!'
     expect(result).toEqual 'Whatever.'
 
-  xit 'ending with whitespace', ->
-    result = bob.hey 'Okay if like my  spacebar  quite a bit?   '
-    expect(result).toEqual 'Sure.'
+  xit 'using acronyms in regular speech', ->
+    result = bob.hey "It's OK if you don't want to go work for NASA."
+    expect(result).toEqual 'Whatever.'
 
-  xit 'other whitespace', ->
-    result = bob.hey "\n\r \t"
-    expect(result).toEqual 'Fine. Be that way!'
+  xit 'no letters', ->
+    result = bob.hey '1, 2, 3'
+    expect(result).toEqual 'Whatever.'
+
+  xit 'statement containing question mark', ->
+    result = bob.hey 'Ending with ? means a question.'
+    expect(result).toEqual 'Whatever.'
+
+  xit 'starting with whitespace', ->
+    result = bob.hey '         hmmmmmmm...'
+    expect(result).toEqual 'Whatever.'
 
   xit 'non-question ending with whitespace', ->
     result = bob.hey 'This is a statement ending with whitespace      '
diff --git a/exercises/practice/perfect-numbers/.meta/config.json b/exercises/practice/perfect-numbers/.meta/config.json
index 95be96e8..4840fcf3 100644
--- a/exercises/practice/perfect-numbers/.meta/config.json
+++ b/exercises/practice/perfect-numbers/.meta/config.json
@@ -15,5 +15,5 @@
   },
   "blurb": "Determine if a number is perfect, abundant, or deficient based on Nicomachus' (60 - 120 CE) classification scheme for positive integers.",
   "source": "Taken from Chapter 2 of Functional Thinking by Neal Ford.",
-  "source_url": "https://www.oreilly.com/library/view/functional-thinking/9781449365509/"
+  "source_url": "https://nealford.com/books/functionalthinking.html"
 }
diff --git a/exercises/practice/state-of-tic-tac-toe/.meta/tests.toml b/exercises/practice/state-of-tic-tac-toe/.meta/tests.toml
index 8fc25e21..5f574b2a 100644
--- a/exercises/practice/state-of-tic-tac-toe/.meta/tests.toml
+++ b/exercises/practice/state-of-tic-tac-toe/.meta/tests.toml
@@ -99,3 +99,9 @@ reimplements = "b1dc8b13-46c4-47db-a96d-aa90eedc4e8d"
 
 [4801cda2-f5b7-4c36-8317-3cdd167ac22c]
 description = "Invalid boards -> Invalid board: players kept playing after a win"
+
+[5a84757a-fc86-4328-aec9-a5759e6ed35d]
+description = "Invalid boards -> Invalid board: O kept playing after X wins"
+
+[cf25543d-583a-4656-b9ab-f82dc00a4a02]
+description = "Invalid boards -> Invalid board: X kept playing after O wins"
diff --git a/exercises/practice/state-of-tic-tac-toe/state-of-tic-tac-toe.spec.coffee b/exercises/practice/state-of-tic-tac-toe/state-of-tic-tac-toe.spec.coffee
index ead48460..37b0a9f7 100644
--- a/exercises/practice/state-of-tic-tac-toe/state-of-tic-tac-toe.spec.coffee
+++ b/exercises/practice/state-of-tic-tac-toe/state-of-tic-tac-toe.spec.coffee
@@ -108,3 +108,11 @@ describe 'State of Tic-Tac-Toe', ->
   xit 'Invalid board: players kept playing after a win', ->
     board = ['XXX', 'OOO', 'XOX']
     expect(-> gamestate board).toThrow new Error 'Impossible board: game should have ended after the game was won'
+
+  xit 'Invalid board: O kept playing after X wins', ->
+    board = ['OO ', 'XXX', ' O ']
+    expect(-> gamestate board).toThrow new Error 'Impossible board: game should have ended after the game was won'
+
+  xit 'Invalid board: X kept playing after O wins', ->
+    board = ['XX ', 'OOO', ' XX']
+    expect(-> gamestate board).toThrow new Error 'Impossible board: game should have ended after the game was won'