diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index e992298d8..a5211e800 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -70,19 +70,6 @@ class Asset extends Depreciable
     */
     protected $injectUniqueIdentifier = true;
 
-    // We set these as protected dates so that they will be easily accessible via Carbon
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'purchase_date',
-        'last_checkout',
-        'expected_checkin',
-        'last_audit_date',
-        'next_audit_date'
-    ];
-
-
     protected $casts = [
         'purchase_date' => 'date',
         'last_checkout' => 'datetime',
@@ -96,6 +83,9 @@ class Asset extends Depreciable
         'rtd_company_id' => 'integer',
         'supplier_id'    => 'integer',
         'byod'           => 'boolean',
+        'created_at'     => 'datetime',
+        'updated_at'   => 'datetime',
+        'deleted_at'  => 'datetime',
     ];
 
     protected $rules = [
diff --git a/app/Models/User.php b/app/Models/User.php
index bf40982db..c716da074 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -73,18 +73,13 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'location_id'  => 'integer',
         'company_id'   => 'integer',
         'vip'      => 'boolean',
+        'created_at'   => 'datetime',
+        'updated_at'   => 'datetime',
+        'deleted_at'   => 'datetime',
+        'start_date'   => 'datetime:Y-m-d',
+        'end_date'     => 'datetime:Y-m-d',
     ];
 
-
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'start_date' => 'date_format:Y-m-d',
-        'end_date' => 'date_format:Y-m-d',
-    ];
-
-
     /**
      * Model validation rules
      *
diff --git a/crowdin.yml b/crowdin.yml
index 4eccb2adb..7abe441e4 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -3,6 +3,7 @@
 "files": [
   {
     "source" : "/resources/lang/en/**/*.php",
-    "translation" : "/resources/lang/%locale%/%original_file_name%"
+    # https://developer.crowdin.com/configuration-file/#placeholders
+    "translation" : "/resources/lang/%locale%/**/%original_file_name%"
   }
 ]
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 23a0c2580..407aef9b9 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -73,14 +73,11 @@
     <!-- bootstrap color picker -->
     <script nonce="{{ csrf_token() }}">
 
-
         $(function() {
             $('.color').colorpicker({
                 color: '#AA3399',
                 format: 'hex'
             });
-
-
         });
 
     </script>
diff --git a/stubs/test.stub b/stubs/test.stub
new file mode 100644
index 000000000..06b35d3e1
--- /dev/null
+++ b/stubs/test.stub
@@ -0,0 +1,13 @@
+<?php
+
+namespace {{ namespace }};
+
+use Tests\TestCase;
+
+class {{ class }} extends TestCase
+{
+    public function testExample()
+    {
+        //
+    }
+}
diff --git a/stubs/test.unit.stub b/stubs/test.unit.stub
new file mode 100644
index 000000000..06b35d3e1
--- /dev/null
+++ b/stubs/test.unit.stub
@@ -0,0 +1,13 @@
+<?php
+
+namespace {{ namespace }};
+
+use Tests\TestCase;
+
+class {{ class }} extends TestCase
+{
+    public function testExample()
+    {
+        //
+    }
+}