diff --git a/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php b/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
index 5f25dd7..24a9bdb 100644
--- a/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
+++ b/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
@@ -35,6 +35,18 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#default_value' => 'Test name',
     ];
 
+    $form['checkbox_enabled'] = [
+      '#type' => 'checkbox',
+      '#title' => 'Checkbox enabled',
+      '#default_value' => TRUE,
+    ];
+
+    $form['checkbox_disabled'] = [
+      '#type' => 'checkbox',
+      '#title' => 'Checkbox disabled',
+      '#default_value' => FALSE,
+    ];
+
     $form['description'] = [
       '#type' => 'textfield',
       '#title' => 'Description',
diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index 9931804..1b47c3f 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -168,6 +168,41 @@ public function testLegacyFieldAsserts() {
     $this->assertNoFieldByXPath('//notexisting');
     $this->assertNoFieldByXPath("//input[@id = 'edit-name']", 'wrong value');
 
+    // *** NoField ***
+    $this->assertNoField('invalid_name_and_id');
+
+    // Test that the assertion fails correctly when searching by name.
+    try {
+      $this->assertNoField('name');
+      $this->fail('The "name" field was not found based on name.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoField correctly failed. The "name" field was found by name.');
+    }
+
+    // Test that the assertion fails correctly when searching by id.
+    try {
+      $this->assertNoField('edit-name');
+      $this->fail('The "name" field was not found based on id.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoField correctly failed. The "name" field was found by id.');
+    }
+
+    // *** Field ***
+    $this->assertField('name');
+    $this->assertField('edit-name');
+
+    // Test that the assertion fails correctly if the field does not exist.
+    try {
+      $this->assertField('invalid_name_and_id');
+      $this->fail('The "invalid_name_and_id" field was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertField correctly failed. The "invalid_name_and_id" field was not found.');
+    }
+
+    // *** NoFieldById ***
     $this->assertNoFieldById('name');
     $this->assertNoFieldById('name', 'not the value');
     $this->assertNoFieldById('notexisting');
@@ -191,6 +226,7 @@ public function testLegacyFieldAsserts() {
       $this->pass('The "name" field was found.');
     }
 
+    // *** FieldById ***
     $this->assertFieldById('edit-name', NULL);
     $this->assertFieldById('edit-name', 'Test name');
     $this->assertFieldById('edit-description', NULL);
@@ -205,15 +241,16 @@ public function testLegacyFieldAsserts() {
       $this->pass('The "edit-name" field with no value was not found.');
     }
 
-    // Test that the assertion fails correctly if NULL is passed in.
+    // Test that the assertion fails correctly if the wrong value is passed in.
     try {
-      $this->assertFieldById('name', NULL);
-      $this->fail('The "name" field was found.');
+      $this->assertFieldById('edit-name', 'not the value');
+      $this->fail('The "name" field was found, using the wrong value.');
     }
-    catch (ExpectationException $e) {
-      $this->pass('The "name" field was not found.');
+    catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+      $this->pass('The "name" field was not found, using the wrong value.');
     }
 
+    // *** NoFieldByName ***
     $this->assertNoFieldByName('name');
     $this->assertNoFieldByName('name', 'not the value');
     $this->assertNoFieldByName('notexisting');
@@ -237,6 +274,34 @@ public function testLegacyFieldAsserts() {
       $this->pass('The "name" field was found.');
     }
 
+    // *** FieldByName ***
+    $this->assertFieldByName('name');
+    $this->assertFieldByName('name', NULL);
+    $this->assertFieldByName('name', 'Test name');
+    $this->assertFieldByName('description');
+    $this->assertFieldByName('description', '');
+    $this->assertFieldByName('description', NULL);
+
+    // Test that the assertion fails correctly if given the wrong name.
+    try {
+      $this->assertFieldByName('non-existing-name');
+      $this->fail('The "non-existing-name" field was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The "non-existing-name" field was not found');
+    }
+        
+    // Test that the assertion fails correctly if given the wrong value.
+    try {
+      $this->assertFieldByName('name', 'not the value');
+      $this->fail('The "name" field with incorrect value was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertFieldByName correctly failed. The "name" field with incorrect value was not found.');
+    }
+
+    // *** OPTION ***
+
     $this->assertOptionByText('options', 'one');
     try {
       $this->assertOptionByText('options', 'four');
@@ -246,6 +311,7 @@ public function testLegacyFieldAsserts() {
       $this->pass($e->getMessage());
     }
 
+    // *** BUTTON ***
     $this->assertFieldById('edit-save', NULL);
     // Test that the assertion fails correctly if the field value is passed in
     // rather than the id.
@@ -267,6 +333,43 @@ public function testLegacyFieldAsserts() {
     catch (ExpectationException $e) {
       $this->pass($e->getMessage());
     }
+
+    // *** CHECKBOX ***
+    
+    // Test that checkboxes are found/not found correctly by name, when using
+    // TRUE or FALSE to match their 'checked' state. 
+    $this->assertFieldByName('checkbox_enabled', TRUE);
+    $this->assertFieldByName('checkbox_disabled', FALSE);
+    $this->assertNoFieldByName('checkbox_enabled', FALSE);
+    $this->assertNoFieldByName('checkbox_disabled', TRUE);
+
+    // Test that checkboxes are found/not found correctly by ID, when using
+    // TRUE or FALSE to match their 'checked' state. 
+    $this->assertFieldById('edit-checkbox-enabled', TRUE);
+    $this->assertFieldById('edit-checkbox-disabled', FALSE);
+    $this->assertNoFieldById('edit-checkbox-enabled', FALSE);
+    $this->assertNoFieldById('edit-checkbox-disabled', TRUE);
+
+    // Test that the assertion fails correctly with NULL to ignore the vaue.
+    try {
+      $this->assertNoFieldByName('checkbox_enabled', NULL); // found (and assertion fails) using FALSE, TRUE. NOt found using no value.
+      $this->fail('The checked "checkbox_enabled" field was not found, using value TRUE.');  // fail with TRUE,1,NULL  ie field is found
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The checked "checkbox_enabled" field was found, using value TRUE.');
+    }
+
+    $this->assertFieldChecked('edit-checkbox-enabled');
+    $this->assertNoFieldChecked('edit-checkbox-disabled');
+
+    // Test that the assertion fails correctly with NULL to ignore the vaue.
+    try {
+      $this->assertNoFieldChecked('incorrect_checkbox_id');
+      $this->fail('The "incorrect_checkbox_id" field was found');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('assertNoFieldChecked correctly failed. The ""wrong_checkbox_id"" field was not found.');
+    }
   }
 
   /**