diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json
index a7d7c835c0..61d7a1eda7 100644
--- a/seed_data/challenges/basic-html5-and-css.json
+++ b/seed_data/challenges/basic-html5-and-css.json
@@ -1294,7 +1294,9 @@
       ],
       "tests": [
         "assert($('ul').length > 0, 'Create a <code>ul</code> element.')",
-        "assert($('li').length > 2, 'Add three <code>li</code> elements to your <code>ul</code> element.')"
+        "assert($('li').length > 2, 'Add three <code>li</code> elements to your <code>ul</code> element.')",
+        "assert(editor.match(/<\\/ul>/g), 'Be sure that your <code>ul</code> element has a closing tag.')",
+        "assert(editor.match(/<\\/li>/g) && editor.match(/<\\/li>/g).length > 2, 'Be sure that each of your <code>li</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1359,7 +1361,10 @@
         "assert($('ul').length > 0, 'You should have an <code>ul</code> element on your webpage.')",
         "assert($('ol').length > 0, 'You should have an <code>ol</code> element on your webpage.')",
         "assert($('li').length > 5, 'You should have three <code>li</code> elements within your <code>ul</code> element.')",
-        "assert($('li').length > 5, 'You should have three <code>li</code> elements within your <code>ol</code> element.')"
+        "assert($('li').length > 5, 'You should have three <code>li</code> elements within your <code>ol</code> element.')",
+        "assert(editor.match(/<\\/ol>/g), 'Be sure that your <code>ol</code> element has a closing tag.')",
+        "assert(editor.match(/<\\/ul>/g), 'Be sure that your <code>ul</code> element has a closing tag.')",
+        "assert(editor.match(/<\\/li>/g).length > 5, 'Be sure that each of your <code>li</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade
index a780b2030c..3c3280564d 100644
--- a/views/challengeMap/show.jade
+++ b/views/challengeMap/show.jade
@@ -44,11 +44,11 @@ block content
                     .row
                         .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.large-p.negative-10
                         .col-xs-12.col-sm-9.col-md-10
-                            li.large-p.negative-10 First 200-hour Nonprofit Project
+                            li.large-p.negative-10 200-hour Nonprofit Project #1
                     .row
                         .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.large-p.negative-10
                         .col-xs-12.col-sm-9.col-md-10
-                            li.large-p.negative-10 Second 200-hour Nonprofit Project
+                            li.large-p.negative-10 200-hour Nonprofit Project #2
                     .row
                         .hidden-xs.col-sm-3.col-md-2.ion-locked.padded-ionic-icon.text-center.large-p.negative-10
                         .col-xs-12.col-sm-9.col-md-10