diff --git a/challenges/01-responsive-web-design/css-grid.json b/challenges/01-responsive-web-design/css-grid.json
index 5c34328a1..95fcfa4cd 100644
--- a/challenges/01-responsive-web-design/css-grid.json
+++ b/challenges/01-responsive-web-design/css-grid.json
@@ -15,13 +15,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>display</code> property with a value of <code>grid</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*display\\s*?:\\s*?grid\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>display</code> property with a value of <code>grid</code>.');"
+          "text": "<code>container</code> class should have a <code>display</code> property with a value of <code>grid</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?display\\s*?:\\s*?grid\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>display</code> property with a value of <code>grid</code>.');"
         }
       ],
-      "solutions": ["var code = \".container {display: grid;}\""],
+      "solutions": ["var code = \".container {/**/display: grid;/**/}\""],
       "hints": [],
       "releasedOn": "Feb 15, 2018",
       "challengeType": 0,
@@ -76,14 +74,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-template-columns</code> property with three units of <code>100px</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-columns\\s*?:\\s*?100px\\s*?100px\\s*?100px\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property with three units of <code>100px</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-template-columns</code> property with three units of <code>100px</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-columns\\s*?:\\s*?100px\\s*?100px\\s*?100px\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property with three units of <code>100px</code>.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-columns: 100px 100px 100px;}\""
+        "var code = \".container {/**/grid-template-columns: 100px 100px 100px;/**/}\""
       ],
       "hints": [],
       "releasedOn": "Feb 15, 2018",
@@ -137,14 +133,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-template-rows</code> property with two units of <code>50px</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-rows\\s*?:\\s*?50px\\s*?50px\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-rows</code> property with two units of <code>50px</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-template-rows</code> property with two units of <code>50px</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-rows\\s*?:\\s*?50px\\s*?50px\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-rows</code> property with two units of <code>50px</code>.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-rows: 50px 50px;}\""
+        "var code = \".container {/**/grid-template-rows: 50px 50px;/**/}\""
       ],
       "hints": [],
       "releasedOn": "",
@@ -205,14 +199,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-template-columns</code> property that has three columns with the following widths: <code>1fr, 100px, and 2fr</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-columns\\s*?:\\s*?1fr\\s*?100px\\s*?2fr\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property that has three columns with the following widths: <code>1fr, 100px, and 2fr</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-template-columns</code> property that has three columns with the following widths: <code>1fr, 100px, and 2fr</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-columns\\s*?:\\s*?1fr\\s*?100px\\s*?2fr\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property that has three columns with the following widths: <code>1fr, 100px, and 2fr</code>.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-columns: 1fr 100px 2fr;}\""
+        "var code = \".container {/**/grid-template-columns: 1fr 100px 2fr;/**/}\""
       ],
       "hints": [],
       "releasedOn": "",
@@ -270,13 +262,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-column-gap</code> property that has the value of <code>20px</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-column-gap\\s*?:\\s*?20px\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-column-gap</code> property that has the value of <code>20px</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-column-gap</code> property that has the value of <code>20px</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-column-gap\\s*?:\\s*?20px\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-column-gap</code> property that has the value of <code>20px</code>.');"
         }
       ],
-      "solutions": ["var code = \".container {grid-column-gap: 20px;}\""],
+      "solutions": ["var code = \".container {/**/grid-column-gap: 20px;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -332,13 +322,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-row-gap</code> property that has the value of <code>5px</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-row-gap\\s*?:\\s*?5px\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-row-gap</code> property that has the value of <code>5px</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-row-gap</code> property that has the value of <code>5px</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-row-gap\\s*?:\\s*?5px\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-row-gap</code> property that has the value of <code>5px</code>.');"
         }
       ],
-      "solutions": ["var code = \".container {grid-row-gap: 5px;}\""],
+      "solutions": ["var code = \".container {/**/grid-row-gap: 5px;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -394,13 +382,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-gap</code> property that introduces <code>10px</code> gap between the rows and <code>20px</code> gap between the columns.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-gap\\s*?:\\s*?10px\\s*?20px\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-gap</code> property that introduces <code>10px</code> gap between the rows and <code>20px</code> gap between the columns.');"
+          "text": "<code>container</code> class should have a <code>grid-gap</code> property that introduces <code>10px</code> gap between the rows and <code>20px</code> gap between the columns.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-gap\\s*?:\\s*?10px\\s*?20px\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-gap</code> property that introduces <code>10px</code> gap between the rows and <code>20px</code> gap between the columns.');"
         }
       ],
-      "solutions": ["var code = \".container {grid-gap: 10px 20px;}\""],
+      "solutions": ["var code = \".container {/**/grid-gap: 10px 20px;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -462,13 +448,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>item5</code> class should have a <code>grid-column</code> property that has the value of <code>2 / 4</code>.",
-          "testString":
-            "assert(code.match(/.item5\\s*?{[\\s\\S]*grid-column\\s*?:\\s*?2\\s*?\\/\\s*?4\\s*?;[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-column</code> property that has the value of <code>2 / 4</code>.');"
+          "text": "<code>item5</code> class should have a <code>grid-column</code> property that has the value of <code>2 / 4</code>.",
+          "testString": "assert(code.match(/.item5\\s*?{[\\s\\S]*\\/\\s*?grid-column\\s*?:\\s*?2\\s*?\\/\\s*?4\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-column</code> property that has the value of <code>2 / 4</code>.');"
         }
       ],
-      "solutions": ["var code = \".item5 {grid-column: 2 / 4;}\""],
+      "solutions": ["var code = \".item5 {/**/grid-column: 2 / 4;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -528,13 +512,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>item5</code> class should have a <code>grid-row</code> property that has the value of <code>2 / 4</code>.",
-          "testString":
-            "assert(code.match(/.item5\\s*?{[\\s\\S]*grid-row\\s*?:\\s*?2\\s*?\\/\\s*?4\\s*?;[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-row</code> property that has the value of <code>2 / 4</code>.');"
+          "text": "<code>item5</code> class should have a <code>grid-row</code> property that has the value of <code>2 / 4</code>.",
+          "testString": "assert(code.match(/.item5\\s*?{[\\s\\S]*\\/\\s*?grid-row\\s*?:\\s*?2\\s*?\\/\\s*?4\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-row</code> property that has the value of <code>2 / 4</code>.');"
         }
       ],
-      "solutions": ["var code = \".item5 {grid-row: 2 / 4;}\""],
+      "solutions": ["var code = \".item5 {/**/grid-row: 2 / 4;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -598,13 +580,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>item2</code> class should have a <code>justify-self</code> property that has the value of <code>center</code>.",
-          "testString":
-            "assert(code.match(/.item2\\s*?{[\\s\\S]*justify-self\\s*?:\\s*?center\\s*?;[\\s\\S]*}/gi), '<code>item2</code> class should have a <code>justify-self</code> property that has the value of <code>center</code>.');"
+          "text": "<code>item2</code> class should have a <code>justify-self</code> property that has the value of <code>center</code>.",
+          "testString": "assert(code.match(/.item2\\s*?{[\\s\\S]*\\/\\s*?justify-self\\s*?:\\s*?center\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>item2</code> class should have a <code>justify-self</code> property that has the value of <code>center</code>.');"
         }
       ],
-      "solutions": ["var code = \".item2 {justify-self: center;}\""],
+      "solutions": ["var code = \".item2 {/**/justify-self: center;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -665,13 +645,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>item3</code> class should have a <code>align-self</code> property that has the value of <code>end</code>.",
-          "testString":
-            "assert(code.match(/.item3\\s*?{[\\s\\S]*align-self\\s*?:\\s*?end\\s*?;[\\s\\S]*}/gi), '<code>item3</code> class should have a <code>align-self</code> property that has the value of <code>end</code>.');"
+          "text": "<code>item3</code> class should have a <code>align-self</code> property that has the value of <code>end</code>.",
+          "testString": "assert(code.match(/.item3\\s*?{[\\s\\S]*\\/\\s*?align-self\\s*?:\\s*?end\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>item3</code> class should have a <code>align-self</code> property that has the value of <code>end</code>.');"
         }
       ],
-      "solutions": ["var code = \".item3 {align-self: end;}\""],
+      "solutions": ["var code = \".item3 {/**/align-self: end;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -732,13 +710,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>justify-items</code> property that has the value of <code>center</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*justify-items\\s*?:\\s*?center\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>justify-items</code> property that has the value of <code>center</code>.');"
+          "text": "<code>container</code> class should have a <code>justify-items</code> property that has the value of <code>center</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?justify-items\\s*?:\\s*?center\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>justify-items</code> property that has the value of <code>center</code>.');"
         }
       ],
-      "solutions": ["var code = \".container {justify-items: center;}\""],
+      "solutions": ["var code = \".container {/**/justify-items: center;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -795,13 +771,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>align-items</code> property that has the value of <code>end</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*align-items\\s*?:\\s*?end\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>align-items</code> property that has the value of <code>end</code>.');"
+          "text": "<code>container</code> class should have a <code>align-items</code> property that has the value of <code>end</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?align-items\\s*?:\\s*?end\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>align-items</code> property that has the value of <code>end</code>.');"
         }
       ],
-      "solutions": ["var code = \".container {align-items: end;}\""],
+      "solutions": ["var code = \".container {/**/align-items: end;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -862,14 +836,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-template-areas</code> property similar to the preview but has <code>.</code> instead of the <code>advert</code> area.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-areas\\s*?:\\s*?\"\\s*?header\\s*?header\\s*?header\\s*?\"\\s*?\"\\s*?.\\s*?content\\s*?content\\s*?\"\\s*?\"\\s*?footer\\s*?footer\\s*?footer\\s*?\"\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-areas</code> propertiy similar to the preview but has <code>.</code> instead of the <code>advert</code> area.');"
+          "text": "<code>container</code> class should have a <code>grid-template-areas</code> property similar to the preview but has <code>.</code> instead of the <code>advert</code> area.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-areas\\s*?:\\s*?\"\\s*?header\\s*?header\\s*?header\\s*?\"\\s*?\"\\s*?.\\s*?content\\s*?content\\s*?\"\\s*?\"\\s*?footer\\s*?footer\\s*?footer\\s*?\"\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-areas</code> propertiy similar to the preview but has <code>.</code> instead of the <code>advert</code> area.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-areas: \\\"header header header\\\" \\\". content content\\\" \\\"footer footer footer\\\";}\""
+        "var code = \".container {/**/grid-template-areas: \\\"header header header\\\" \\\". content content\\\" \\\"footer footer footer\\\";/**/}\""
       ],
       "hints": [],
       "releasedOn": "",
@@ -932,13 +904,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>footer</code>.",
-          "testString":
-            "assert(code.match(/.item5\\s*?{[\\s\\S]*grid-area\\s*?:\\s*?footer\\s*?;[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>footer</code>.');"
+          "text": "<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>footer</code>.",
+          "testString": "assert(code.match(/.item5\\s*?{[\\s\\S]*\\/\\s*?grid-area\\s*?:\\s*?footer\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>footer</code>.');"
         }
       ],
-      "solutions": ["var code = \".item5 {grid-area: footer;}\""],
+      "solutions": ["var code = \".item5 {/**/grid-area: footer;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -1006,13 +976,11 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>3/1/4/4</code>.",
-          "testString":
-            "assert(code.match(/.item5\\s*?{[\\s\\S]*grid-area\\s*?:\\s*?3\\s*?\\/\\s*?1\\s*?\\/\\s*?4\\s*?\\/\\s*?4\\s*?;[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>3/1/4/4</code>.');"
+          "text": "<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>3/1/4/4</code>.",
+          "testString": "assert(code.match(/.item5\\s*?{[\\s\\S]*\\/\\s*?grid-area\\s*?:\\s*?3\\s*?\\/\\s*?1\\s*?\\/\\s*?4\\s*?\\/\\s*?4\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>item5</code> class should have a <code>grid-area</code> property that has the value of <code>3/1/4/4</code>.');"
         }
       ],
-      "solutions": ["var code = \".item5 {grid-area: 3/1/4/4;}\""],
+      "solutions": ["var code = \".item5 {/**/grid-area: 3/1/4/4;/**/}\""],
       "hints": [],
       "releasedOn": "",
       "challengeType": 0,
@@ -1080,14 +1048,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the width of <code>1fr</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?3\\s*?,\\s*?1fr\\s*?\\)\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the width of <code>1fr</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the width of <code>1fr</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?3\\s*?,\\s*?1fr\\s*?\\)\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the width of <code>1fr</code>.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-columns: repeat(3, 1fr);}\""
+        "var code = \".container {/**/grid-template-columns: repeat(3, 1fr);/**/}\""
       ],
       "hints": [],
       "releasedOn": "",
@@ -1147,14 +1113,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the minimum width of <code>90px</code> and maximum width of <code>1fr</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?3\\s*?,\\s*?minmax\\s*?\\(\\s*?90px\\s*?,\\s*?1fr\\s*?\\)\\s*?\\)\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the minimum width of <code>90px</code> and maximum width of <code>1fr</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the minimum width of <code>90px</code> and maximum width of <code>1fr</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?3\\s*?,\\s*?minmax\\s*?\\(\\s*?90px\\s*?,\\s*?1fr\\s*?\\)\\s*?\\)\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property that is set to repeat 3 columns with the minimum width of <code>90px</code> and maximum width of <code>1fr</code>.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-columns: repeat(3, minmax(90px, 1fr));}\""
+        "var code = \".container {/**/grid-template-columns: repeat(3, minmax(90px, 1fr));/**/}\""
       ],
       "hints": [],
       "releasedOn": "",
@@ -1216,14 +1180,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fill</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?auto-fill\\s*?,\\s*?minmax\\s*?\\(\\s*?60px\\s*?,\\s*?1fr\\s*?\\)\\s*?\\)\\s*?;[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fill</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.');"
+          "text": "<code>container</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fill</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?auto-fill\\s*?,\\s*?minmax\\s*?\\(\\s*?60px\\s*?,\\s*?1fr\\s*?\\)\\s*?\\)\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fill</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));}\""
+        "var code = \".container {/**/grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));/**/}\""
       ],
       "hints": [],
       "releasedOn": "",
@@ -1299,14 +1261,12 @@
       ],
       "tests": [
         {
-          "text":
-            "<code>container2</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fit</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.",
-          "testString":
-            "assert(code.match(/.container\\s*?{[\\s\\S]*grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?auto-fit\\s*?,\\s*?minmax\\s*?\\(\\s*?60px\\s*?,\\s*?1fr\\s*?\\)\\s*?\\)\\s*?;[\\s\\S]*}/gi), '<code>container2</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fit</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.');"
+          "text": "<code>container2</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fit</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.",
+          "testString": "assert(code.match(/.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-columns\\s*?:\\s*?repeat\\s*?\\(\\s*?auto-fit\\s*?,\\s*?minmax\\s*?\\(\\s*?60px\\s*?,\\s*?1fr\\s*?\\)\\s*?\\)\\s*?;\\s*?\\/[\\s\\S]*}/gi), '<code>container2</code> class should have a <code>grid-template-columns</code> property with <code>repeat</code> and <code>auto-fit</code> that will fill the grid with columns that have a minimum width of <code>60px</code> and maximum of <code>1fr</code>.');"
         }
       ],
       "solutions": [
-        "var code = \".container {grid-template-columns: repeat( auto-fill, minmax(60px, 1fr));} .container2 {grid-template-columns: repeat(auto-fit, minmax(60px, 1fr));}\""
+        "var code = \".container {grid-template-columns: repeat( auto-fill, minmax(60px, 1fr));} .container2 {/**/grid-template-columns: repeat(auto-fit, minmax(60px, 1fr));/**/}\""
       ],
       "hints": [],
       "releasedOn": "",
@@ -1383,14 +1343,12 @@
       ],
       "tests": [
         {
-          "text":
-            "When the viewport is <code>400px</code> or more, <code>container</code> class should have a <code>grid-template-areas</code> property in which the footer and header areas occupy the top and bottom rows respectively and advert and content occupy the left and right columns of the middle row.",
-          "testString":
-            "assert(code.match(/@media\\s*?\\(\\s*?min-width\\s*?:\\s*?400px\\s*?\\)[\\s\\S]*.container\\s*?{[\\s\\S]*grid-template-areas\\s*?:\\s*?\"\\s*?header\\s*?header\\s*?\"\\s*?\"\\s*?advert\\s*?content\\s*?\"\\s*?\"\\s*?footer\\s*?footer\\s*?\"\\s*?;[\\s\\S]*}/gi), 'When the viewport is <code>400px</code> or more, <code>container</code> class should have a <code>grid-template-areas</code> property in which the footer and header areas occupy the top and bottom rows respectively and advert and content occupy the left and right columns of the middle row.');"
+          "text": "When the viewport is <code>400px</code> or more, <code>container</code> class should have a <code>grid-template-areas</code> property in which the footer and header areas occupy the top and bottom rows respectively and advert and content occupy the left and right columns of the middle row.",
+          "testString": "assert(code.match(/@media\\s*?\\(\\s*?min-width\\s*?:\\s*?400px\\s*?\\)[\\s\\S]*.container\\s*?{[\\s\\S]*\\/\\s*?grid-template-areas\\s*?:\\s*?\"\\s*?header\\s*?header\\s*?\"\\s*?\"\\s*?advert\\s*?content\\s*?\"\\s*?\"\\s*?footer\\s*?footer\\s*?\"\\s*?;\\s*?\\/[\\s\\S]*}/gi), 'When the viewport is <code>400px</code> or more, <code>container</code> class should have a <code>grid-template-areas</code> property in which the footer and header areas occupy the top and bottom rows respectively and advert and content occupy the left and right columns of the middle row.');"
         }
       ],
       "solutions": [
-        "var code = \"@media (min-width: 400px){.container{ grid-template-areas: \\\"header header\\\" \\\"advert content\\\" \\\"footer footer\\\";}}\""
+        "var code = \"@media (min-width: 400px){.container{ /**/grid-template-areas: \\\"header header\\\" \\\"advert content\\\" \\\"footer footer\\\";/**/}}\""
       ],
       "hints": [],
       "releasedOn": "",