diff --git a/seed_data/challenges/bootstrap.json b/seed_data/challenges/bootstrap.json
index bcf2090c1a..d08369dea9 100644
--- a/seed_data/challenges/bootstrap.json
+++ b/seed_data/challenges/bootstrap.json
@@ -618,9 +618,9 @@
         "The \"row\" class is applied to a <code>div</code>, and the buttons themselves can be wrapped within it."
       ],
       "tests": [
-        "assert($('div.row:has(button)').length > 2, 'Your buttons should be wrapped within a div with the class \"row\".')",
-        "assert($('div.col-xs-4').length > 2, 'Each of your Bootstrap buttons should be wrapped in a div with the class \"col-xs-4\".')",
-        "assert(editor.match(/<\\/button>/g) && editor.match(/<\\/button>/g).length === editor.match(/<button>/g).length, 'Make sure each of your <code>button</code> elements has a closing tag.')",
+        "assert($('div.row:has(button)'), 'Your buttons should all be wrapped within the same <code>div</code> element with the class \"row\".')",
+        "assert($('div.col-xs-4').length > 2, 'Each of your Bootstrap buttons should be wrapped within its own a <code>div</code> element with the class \"col-xs-4\".')",
+        "assert(editor.match(/<\\/button>/g) && editor.match(/<button/g) && editor.match(/<\\/button>/g).length === editor.match(/<button/g).length, 'Make sure each of your <code>button</code> elements has a closing tag.')",
         "assert(editor.match(/<\\/div>/g) && editor.match(/<div/g) && editor.match(/<\\/div>/g).length === editor.match(/<div/g).length, 'Make sure each of your <code>div</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
@@ -710,7 +710,8 @@
         "assert(!$('h2').hasClass('red-text'), 'You h2 element should no longer have the class \"red-text\".')",
         "assert($('h2').hasClass('text-primary'), 'You h2 element should now have the class \"text-primary\".')",
         "assert(!$('p').css('font-family').match(/monospace/i), 'Your paragraph elements should no longer use the font \"Monospace\".')",
-        "assert($('img').hasClass('img-responsive') && !$('img').hasClass('smaller-image'), 'Remove the \"smaller-image\" class from your top image and replace it with the \"img-responsive\" class.')"
+        "assert(!$('img').hasClass('smaller-image'), 'Remove the \"smaller-image\" class from your top image.')",
+        "assert($('.img-responsive').length > 1, 'Add the \"img-responsive\" class to your top image.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -896,8 +897,7 @@
       "tests": [
         "assert($('i').hasClass('fa fa-thumbs-up'), 'Add an <code>i</code> element with the classes \"fa\" and \"fa-thumbs-up\".')",
         "assert($('button').children('i').length > 0, 'Wrap your <code>i</code> element within your <code>button</code> element.')",
-        "assert(editor.match(/<\\/i>/g), 'Be sure to close your <code>i</code> element with a closing tag.')",
-        "assert(editor.match(/<\\/i>/g) && editor.match(/<i/g) && editor.match(/<\\/i/g).length === editor.match(/<i/g).length, 'Make sure your <code>i</code> element has a closing tag.')"
+        "assert(editor.match(/<\\/i>/g) && editor.match(/<i/g) && editor.match(/<\\/i>/g).length === editor.match(/<i/g).length, 'Make sure your <code>i</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",