diff --git a/botcha.admin.inc b/botcha.admin.inc
index e7e5ea2..9fcc451 100644
--- a/botcha.admin.inc
+++ b/botcha.admin.inc
@@ -60,6 +60,13 @@ function botcha_admin_settings($form, &$form_state) {
   // Handle the button for resetting the BOTCHA statistics.
   // This is done here instead of in a submit handler because the button is
   // not a submitting button.
+  $form['botcha_statistics']['botcha_statistics_group']['botcha_statistics_reset'] = array(
+    '#type' => 'button',
+    '#value' => t('Reset BOTCHA statistics'),
+    '#submit' => array('botcha_statistics_reset'),
+    // Pull it down.
+    '#weight' => 100,
+  );
   if (isset($form_state['input']['op']) && $form_state['input']['op']
     == $form['botcha_statistics']['botcha_statistics_group']['botcha_statistics_reset']['#value']) {
     variable_set('botcha_form_passed_counter', 0);
@@ -71,7 +78,7 @@ function botcha_admin_settings($form, &$form_state) {
   $build_cnt = variable_get('botcha_form_passed_counter', 0) + $block_cnt;
   $form['botcha_statistics']['botcha_statistics_group']['botcha_statistics'] = array(
     '#type' => 'item',
-    '#value' => format_plural(
+    '#markup' => format_plural(
       $block_cnt,
       'Already 1 blocked form submission.',
       'Already @count blocked form submissions.'
@@ -79,12 +86,7 @@ function botcha_admin_settings($form, &$form_state) {
     . ($build_cnt > 0 ? ' ' . t('(!percent% of total !build_cnt processed)',
       array('!percent' => sprintf("%0.3f", 100 * $block_cnt / $build_cnt), '!build_cnt' => $build_cnt)) : ''),
   );
-  $form['botcha_statistics']['botcha_statistics_group']['botcha_statistics_reset'] = array(
-    '#type' => 'button',
-    '#value' => t('Reset BOTCHA statistics'),
-    '#submit' => array('botcha_statistics_reset'),
-  );
-  $form['buttons']['submit'] = array(
+  $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration'),
   );
diff --git a/botcha.test b/botcha.test
index 9201a8a..b9bba1d 100644
--- a/botcha.test
+++ b/botcha.test
@@ -673,6 +673,30 @@ class BotchaAdminTestCase extends BotchaBaseWebTestCase {
   }
 
   /**
+   * Testing general BOTCHA admin functionality.
+   */
+  function testAdminGeneral() {
+    // Log in as admin
+    $this->drupalLogin($this->admin_user);
+    // Clean the environment.
+    Botcha::clean();
+    variable_set('botcha_form_passed_counter',  $pass_cnt = rand(0, 10000));
+    variable_set('botcha_form_blocked_counter', $block_cnt = rand(0, 10000));
+    $build_cnt = $pass_cnt + $block_cnt;
+    // Assert that the statistics is present.
+    $this->drupalGet('admin/config/people/botcha');
+    $this->assertText("Already {$block_cnt} blocked form submissions.", 'BOTCHA blocked count statistics is present', 'BOTCHA');
+    $percent = sprintf("%0.3f", 100 * $block_cnt / $build_cnt);
+    $this->assertText("({$percent}% of total {$build_cnt} processed)", 'BOTCHA total count statistics is present', 'BOTCHA');
+    // Reset BOTCHA statistics.
+    $this->drupalPost(NULL, array(), t('Reset BOTCHA statistics'));
+    // Assert that the statistics is reset.
+    $this->assertText("BOTCHA statistics have been reset.", "Message displayed", 'BOTCHA');
+    $this->assertText("Already 0 blocked form submissions.", 'BOTCHA blocked count statistics is reset', 'BOTCHA');
+    $this->assertNoText("({$percent}% of total {$build_cnt} processed)", 'BOTCHA total count statistics is reset', 'BOTCHA');    
+  }
+
+  /**
    * Testing of the BOTCHA administration links.
    */
   function testBotchaAdminLinks() {