diff --git a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc0f1ae40802781b2ea972.md b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc0f1ae40802781b2ea972.md
index 67b986fdc67..28d72d6e6c9 100644
--- a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc0f1ae40802781b2ea972.md
+++ b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc0f1ae40802781b2ea972.md
@@ -33,7 +33,8 @@ assert.isFunction(calculateSum);
 Your `calculateSum` function should take two parameters, `num1` and `num2`.
 
 ```js
-assert.match(code, /calculateSum\s*(?:=\s*)?\(\s*num1\s*,\s*num2\s*\)\s*/);
+const regex = __helpers.functionRegex('calculateSum', ['num1', 'num2']);
+assert.match(__helpers.removeJSComments(code), regex);
 ```
 
 # --seed--
diff --git a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc14ca14e65e7a9ebecb80.md b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc14ca14e65e7a9ebecb80.md
index 0947f850906..6415b09fa77 100644
--- a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc14ca14e65e7a9ebecb80.md
+++ b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc14ca14e65e7a9ebecb80.md
@@ -24,7 +24,8 @@ assert.isFunction(calculateDifference);
 Your `calculateDifference` function should have two parameters called `num1` and `num2`.
 
 ```js
-assert.match(code, /calculateDifference\s*(?:=\s*)?\(\s*num1\s*,\s*num2\s*\)\s*/);
+const regex = __helpers.functionRegex('calculateDifference', ['num1', 'num2']);
+assert.match(__helpers.removeJSComments(code), regex);
 ```
 
 Your `calculateDifference` function should return the difference between the two parameters.
diff --git a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc172af7159a7c67804544.md b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc172af7159a7c67804544.md
index dd4856ee22b..79f3323f576 100644
--- a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc172af7159a7c67804544.md
+++ b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc172af7159a7c67804544.md
@@ -26,7 +26,8 @@ assert.isFunction(calculateProduct);
 Your `calculateProduct` function should have two parameters called `num1` and `num2`.
 
 ```js
-assert.match(code, /calculateProduct\s*(?:=\s*)?\(\s*num1\s*,\s*num2\s*\)\s*/);
+const regex = __helpers.functionRegex('calculateProduct', ['num1', 'num2']);
+assert.match(__helpers.removeJSComments(code), regex);
 ```
 
 Your `calculateProduct` function should return the product of the two parameters.
diff --git a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc1a3a39aef47d6473cb2f.md b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc1a3a39aef47d6473cb2f.md
index fdd735d1467..fe060293bb0 100644
--- a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc1a3a39aef47d6473cb2f.md
+++ b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc1a3a39aef47d6473cb2f.md
@@ -26,7 +26,8 @@ assert.isFunction(calculateQuotient);
 Your `calculateQuotient` function should have two parameters called `num1` and `num2`.
 
 ```js
-assert.match(code, /calculateQuotient\s*(?:=\s*)?\(\s*num1\s*,\s*num2\s*\)\s*/);
+const regex = __helpers.functionRegex('calculateQuotient', ['num1', 'num2']);
+assert.match(__helpers.removeJSComments(code), regex);
 ```
 
 Your `calculateQuotient` function should return the quotient of the two parameters.
diff --git a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc21d23238dc8240a8a182.md b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc21d23238dc8240a8a182.md
index 0fe34658034..b04f05fbfc0 100644
--- a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc21d23238dc8240a8a182.md
+++ b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc21d23238dc8240a8a182.md
@@ -37,7 +37,8 @@ assert.isFunction(calculateSquare);
 Your `calculateSquare` function should take a `num` parameter.
 
 ```js
-assert.match(code, /calculateSquare\s*(?:=\s*)?\(\s*num\s*\)/);
+const regex = __helpers.functionRegex('calculateSquare', ['num']);
+assert.match(__helpers.removeJSComments(code), regex);
 ```
 
 Your `calculateSquare` function should return the square of `num`.
diff --git a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc2739f687e484d50bb6f1.md b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc2739f687e484d50bb6f1.md
index 219aafa90c6..3756e38b021 100644
--- a/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc2739f687e484d50bb6f1.md
+++ b/curriculum/challenges/english/25-front-end-development/workshop-calculator/66cc2739f687e484d50bb6f1.md
@@ -35,7 +35,8 @@ assert.isFunction(calculateSquareRoot);
 Your `calculateSquareRoot` function should take a `num` parameter.
 
 ```js
-assert.match(code, /calculateSquareRoot\s*(?:=\s*)?\(\s*num\s*\)/);
+const regex = __helpers.functionRegex('calculateSquareRoot', ['num']);
+assert.match(__helpers.removeJSComments(code), regex);
 ```
 
 Your `calculateSquareRoot` function should return the square root of `num`.