diff --git a/core/modules/contact/src/Entity/Category.php b/core/modules/contact/src/Entity/Category.php
index 0bb2233..0612472 100644
--- a/core/modules/contact/src/Entity/Category.php
+++ b/core/modules/contact/src/Entity/Category.php
@@ -51,7 +51,7 @@ class Category extends ConfigEntityBundleBase implements CategoryInterface {
   public $id;
 
   /**
-   * The human-readable label of this catagory.
+   * The human-readable label of this category.
    *
    * @var string
    */
@@ -65,18 +65,18 @@ class Category extends ConfigEntityBundleBase implements CategoryInterface {
   public $recipients = array();
 
   /**
-   * An auto-reply message
+   * An auto-reply message.
    *
    * @var string
    */
-  public $reply;
+  public $reply = '';
 
   /**
    * The weight of this category.
    *
    * @var int
    */
-  public $weight;
+  public $weight = 0;
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/contact/src/Tests/CategoryMethodsTest.php b/core/modules/contact/src/Tests/CategoryMethodsTest.php
index 80962cf..3029303 100644
--- a/core/modules/contact/src/Tests/CategoryMethodsTest.php
+++ b/core/modules/contact/src/Tests/CategoryMethodsTest.php
@@ -7,12 +7,12 @@
 
 namespace Drupal\contact\Tests;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\simpletest\DrupalUnitTestBase;
 
 /**
  * Tests get and set methods on the category interface.
  */
-class CategoryMethodsTest extends WebTestBase {
+class CategoryMethodsTest extends DrupalUnitTestBase {
 
   /**
    * Modules to enable.