diff --git a/src/app/Observers/SignupCodeObserver.php b/src/app/Observers/SignupCodeObserver.php
index aaf2783c..55126db1 100644
--- a/src/app/Observers/SignupCodeObserver.php
+++ b/src/app/Observers/SignupCodeObserver.php
@@ -1,58 +1,38 @@
 <?php
 
 namespace App\Observers;
 
 use App\SignupCode;
 use Carbon\Carbon;
 
 class SignupCodeObserver
 {
     /**
      * Handle the "creating" event.
      *
-     * Ensure that the code entry is created with a random, large integer.
+     * Ensure that the code entry is created with a random code/short_code.
      *
      * @param \App\User $user The user being created.
      *
      * @return void
      */
-    public function creating(SignupCode $code)
+    public function creating(SignupCode $code): void
     {
         $code_length = env('SIGNUP_CODE_LENGTH', SignupCode::CODE_LENGTH);
         $exp_hours   = env('SIGNUP_CODE_EXPIRY', SignupCode::CODE_EXP_HOURS);
 
         if (empty($code->code)) {
-            $code->short_code = $this->generateShortCode();
+            $code->short_code = SignupCode::generateShortCode();
 
             // FIXME: Replace this with something race-condition free
             while (true) {
                 $code->code = str_random($code_length);
                 if (!SignupCode::find($code->code)) {
                     break;
                 }
             }
         }
 
         $code->expires_at = Carbon::now()->addHours($exp_hours);
     }
-
-    /**
-     * Generate a short code (for human).
-     *
-     * @return string
-     */
-    private function generateShortCode()
-    {
-        $code_length = env('SIGNUP_CODE_LENGTH', SignupCode::SHORTCODE_LENGTH);
-        $code_chars  = env('SIGNUP_CODE_CHARS', SignupCode::SHORTCODE_CHARS);
-        $random      = [];
-
-        for ($i = 1; $i <= $code_length; $i++) {
-            $random[] = $code_chars[rand(0, strlen($code_chars) - 1)];
-        }
-
-        shuffle($random);
-
-        return implode('', $random);
-    }
 }
diff --git a/src/app/SignupCode.php b/src/app/SignupCode.php
index 8a71f907..59b56ec5 100644
--- a/src/app/SignupCode.php
+++ b/src/app/SignupCode.php
@@ -1,80 +1,100 @@
 <?php
 
 namespace App;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
  * The eloquent definition of a SignupCode.
  */
 class SignupCode extends Model
 {
     // Note: Removed '0', 'O', '1', 'I' as problematic with some fonts
     const SHORTCODE_CHARS   = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
     const SHORTCODE_LENGTH  = 5;
     const CODE_LENGTH       = 32;
 
     // Code expires after so many hours
     const CODE_EXP_HOURS    = 24;
 
 
     /**
      * The primary key associated with the table.
      *
      * @var string
      */
     protected $primaryKey = 'code';
 
     /**
      * Indicates if the IDs are auto-incrementing.
      *
      * @var bool
      */
     public $incrementing = false;
 
     /**
      * The "type" of the auto-incrementing ID.
      *
      * @var string
      */
     protected $keyType = 'string';
 
     /**
      * Indicates if the model should be timestamped.
      *
      * @var bool
      */
     public $timestamps = false;
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = ['code', 'short_code', 'data', 'expires_at'];
 
     /**
      * The attributes that should be cast to native types.
      *
      * @var array
      */
     protected $casts = ['data' => 'array'];
 
     /**
      * The attributes that should be mutated to dates.
      *
      * @var array
      */
     protected $dates = ['expires_at'];
 
     /**
      * Check if code is expired.
      *
      * @return bool True if code is expired, False otherwise
      */
     public function isExpired()
     {
         return $this->expires_at ? Carbon::now()->gte($this->expires_at) : false;
     }
+
+    /**
+     * Generate a short code (for human).
+     *
+     * @return string
+     */
+    public static function generateShortCode(): string
+    {
+        $code_length = env('SIGNUP_CODE_LENGTH', self::SHORTCODE_LENGTH);
+        $code_chars  = env('SIGNUP_CODE_CHARS', self::SHORTCODE_CHARS);
+        $random      = [];
+
+        for ($i = 1; $i <= $code_length; $i++) {
+            $random[] = $code_chars[rand(0, strlen($code_chars) - 1)];
+        }
+
+        shuffle($random);
+
+        return implode('', $random);
+    }
 }
diff --git a/src/tests/Feature/SignupCodeTest.php b/src/tests/Feature/SignupCodeTest.php
new file mode 100644
index 00000000..25af7323
--- /dev/null
+++ b/src/tests/Feature/SignupCodeTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\SignupCode;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class SignupCodeTest extends TestCase
+{
+    /**
+     * Test SignupCode creation
+     *
+     * @return void
+     */
+    public function testSignupCodeCreate()
+    {
+        $data = [
+            'data' => [
+                'email' => 'User@email.org',
+                'name' => 'User Name',
+            ]
+        ];
+
+        $now = new \DateTime('now');
+
+        $code = SignupCode::create($data);
+
+        $this->assertFalse($code->isExpired());
+        $this->assertTrue(strlen($code->code) === SignupCode::CODE_LENGTH);
+        $this->assertTrue(strlen($code->short_code) === SignupCode::SHORTCODE_LENGTH);
+        $this->assertSame($data['data'], $code->data);
+        $this->assertInstanceOf(\DateTime::class, $code->expires_at);
+        $this->assertSame(SignupCode::CODE_EXP_HOURS, $code->expires_at->diff($now)->h + 1);
+
+        $inst = SignupCode::find($code->code);
+
+        $this->assertInstanceOf(SignupCode::class, $inst);
+        $this->assertSame($inst->code, $code->code);
+    }
+}
diff --git a/src/tests/Unit/SignupCodeTest.php b/src/tests/Unit/SignupCodeTest.php
new file mode 100644
index 00000000..d12c0cd5
--- /dev/null
+++ b/src/tests/Unit/SignupCodeTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\SignupCode;
+
+use Tests\TestCase;
+
+class SignupCodeTest extends TestCase
+{
+    /**
+     * Test SignupCode::generateShortCode()
+     *
+     * @return void
+     */
+    public function testGenerateShortCode()
+    {
+        $code = SignupCode::generateShortCode();
+
+        $this->assertTrue(is_string($code));
+        $this->assertTrue(strlen($code) === SignupCode::SHORTCODE_LENGTH);
+        $this->assertTrue(strspn($code, SignupCode::SHORTCODE_CHARS) === strlen($code));
+    }
+}