diff --git a/tests/specs/blog/models/base/Category.php b/tests/specs/blog/models/base/Category.php
index f22e0014..1c7cdb97 100644
--- a/tests/specs/blog/models/base/Category.php
+++ b/tests/specs/blog/models/base/Category.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/blog/models/base/Comment.php b/tests/specs/blog/models/base/Comment.php
index 44cd42fc..0fcb9878 100644
--- a/tests/specs/blog/models/base/Comment.php
+++ b/tests/specs/blog/models/base/Comment.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "post_comments".
  *
  * @property int $id
  * @property string $post_id A blog post (uid used as pk for test purposes)
diff --git a/tests/specs/blog/models/base/Fakerable.php b/tests/specs/blog/models/base/Fakerable.php
index ae9f2af1..a00ac9ae 100644
--- a/tests/specs/blog/models/base/Fakerable.php
+++ b/tests/specs/blog/models/base/Fakerable.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "fakerable".
  *
  * @property int $id
  * @property bool $active
diff --git a/tests/specs/blog/models/base/Post.php b/tests/specs/blog/models/base/Post.php
index 457978b5..ac7aad1f 100644
--- a/tests/specs/blog/models/base/Post.php
+++ b/tests/specs/blog/models/base/Post.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/blog/models/base/User.php b/tests/specs/blog/models/base/User.php
index f0e484e8..c7023d15 100644
--- a/tests/specs/blog/models/base/User.php
+++ b/tests/specs/blog/models/base/User.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/blog_v2/models/base/Category.php b/tests/specs/blog_v2/models/base/Category.php
index a70be3ff..b15dac96 100644
--- a/tests/specs/blog_v2/models/base/Category.php
+++ b/tests/specs/blog_v2/models/base/Category.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/blog_v2/models/base/Comment.php b/tests/specs/blog_v2/models/base/Comment.php
index a732c5c0..1f4e0be7 100644
--- a/tests/specs/blog_v2/models/base/Comment.php
+++ b/tests/specs/blog_v2/models/base/Comment.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "v2_comments".
  *
  * @property int $id
  * @property int $post_id A blog post (uid used as pk for test purposes)
diff --git a/tests/specs/blog_v2/models/base/Post.php b/tests/specs/blog_v2/models/base/Post.php
index 44fe4275..fa50b41a 100644
--- a/tests/specs/blog_v2/models/base/Post.php
+++ b/tests/specs/blog_v2/models/base/Post.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/blog_v2/models/base/Tag.php b/tests/specs/blog_v2/models/base/Tag.php
index f1a57778..b4e9c94a 100644
--- a/tests/specs/blog_v2/models/base/Tag.php
+++ b/tests/specs/blog_v2/models/base/Tag.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "v2_tags".
  *
  * @property int $id
  * @property string $name
diff --git a/tests/specs/blog_v2/models/base/User.php b/tests/specs/blog_v2/models/base/User.php
index 195b5b5e..3e266745 100644
--- a/tests/specs/blog_v2/models/base/User.php
+++ b/tests/specs/blog_v2/models/base/User.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/change_column_name/maria/app/models/base/ColumnNameChange.php b/tests/specs/change_column_name/maria/app/models/base/ColumnNameChange.php
index a5393546..0bd44cf8 100644
--- a/tests/specs/change_column_name/maria/app/models/base/ColumnNameChange.php
+++ b/tests/specs/change_column_name/maria/app/models/base/ColumnNameChange.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/change_column_name/mysql/app/models/base/ColumnNameChange.php b/tests/specs/change_column_name/mysql/app/models/base/ColumnNameChange.php
index a5393546..0bd44cf8 100644
--- a/tests/specs/change_column_name/mysql/app/models/base/ColumnNameChange.php
+++ b/tests/specs/change_column_name/mysql/app/models/base/ColumnNameChange.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/change_column_name/pgsql/app/models/base/ColumnNameChange.php b/tests/specs/change_column_name/pgsql/app/models/base/ColumnNameChange.php
index 426b5a1f..fc0e1abb 100644
--- a/tests/specs/change_column_name/pgsql/app/models/base/ColumnNameChange.php
+++ b/tests/specs/change_column_name/pgsql/app/models/base/ColumnNameChange.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/fk_col_name/app/models/base/Delivery.php b/tests/specs/fk_col_name/app/models/base/Delivery.php
index ae7cbd83..214c5278 100644
--- a/tests/specs/fk_col_name/app/models/base/Delivery.php
+++ b/tests/specs/fk_col_name/app/models/base/Delivery.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "deliveries".
  *
  * @property int $id
  * @property string $title
diff --git a/tests/specs/fk_col_name/app/models/base/User.php b/tests/specs/fk_col_name/app/models/base/User.php
index d76c3f4d..9c127aeb 100644
--- a/tests/specs/fk_col_name/app/models/base/User.php
+++ b/tests/specs/fk_col_name/app/models/base/User.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/fk_col_name/app/models/base/Webhook.php b/tests/specs/fk_col_name/app/models/base/Webhook.php
index 8746e8f0..21b4892e 100644
--- a/tests/specs/fk_col_name/app/models/base/Webhook.php
+++ b/tests/specs/fk_col_name/app/models/base/Webhook.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/fk_col_name_index/app/models/base/Delivery.php b/tests/specs/fk_col_name_index/app/models/base/Delivery.php
index ae7cbd83..214c5278 100644
--- a/tests/specs/fk_col_name_index/app/models/base/Delivery.php
+++ b/tests/specs/fk_col_name_index/app/models/base/Delivery.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "deliveries".
  *
  * @property int $id
  * @property string $title
diff --git a/tests/specs/fk_col_name_index/app/models/base/User.php b/tests/specs/fk_col_name_index/app/models/base/User.php
index d76c3f4d..9c127aeb 100644
--- a/tests/specs/fk_col_name_index/app/models/base/User.php
+++ b/tests/specs/fk_col_name_index/app/models/base/User.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/fk_col_name_index/app/models/base/Webhook.php b/tests/specs/fk_col_name_index/app/models/base/Webhook.php
index 29a40568..a179c718 100644
--- a/tests/specs/fk_col_name_index/app/models/base/Webhook.php
+++ b/tests/specs/fk_col_name_index/app/models/base/Webhook.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/id_not_in_rules/app/models/base/Fruit.php b/tests/specs/id_not_in_rules/app/models/base/Fruit.php
index 4b1fcd72..36a8f42f 100644
--- a/tests/specs/id_not_in_rules/app/models/base/Fruit.php
+++ b/tests/specs/id_not_in_rules/app/models/base/Fruit.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/id_not_in_rules/app/models/base/Post.php b/tests/specs/id_not_in_rules/app/models/base/Post.php
index 50c75b41..5a555a3f 100644
--- a/tests/specs/id_not_in_rules/app/models/base/Post.php
+++ b/tests/specs/id_not_in_rules/app/models/base/Post.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "posts".
  *
  * @property string $uid
  * @property string $title
diff --git a/tests/specs/issue_fix/153_nullable_false_in_required/app/models/base/Pristine.php b/tests/specs/issue_fix/153_nullable_false_in_required/app/models/base/Pristine.php
index 8cc79e6f..b6b497bd 100644
--- a/tests/specs/issue_fix/153_nullable_false_in_required/app/models/base/Pristine.php
+++ b/tests/specs/issue_fix/153_nullable_false_in_required/app/models/base/Pristine.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria/models/base/Mailing.php b/tests/specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria/models/base/Mailing.php
index 2839c526..83a982c1 100644
--- a/tests/specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria/models/base/Mailing.php
+++ b/tests/specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/maria/models/base/Mailing.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Contact.php b/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Contact.php
index efbd8b32..194100df 100644
--- a/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Contact.php
+++ b/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Contact.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php b/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php
index 77049b23..ff8629b5 100644
--- a/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php
+++ b/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Invoice.php b/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Invoice.php
index 061e3508..21bfa112 100644
--- a/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Invoice.php
+++ b/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Invoice.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "invoices".
  *
  * @property int $id
  *
diff --git a/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Order.php b/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Order.php
index 74472cd5..0bb4ba68 100644
--- a/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Order.php
+++ b/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Order.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "orders".
  *
  * @property int $id
  * @property string $name
diff --git a/tests/specs/issue_fix/163_generator_crash_when_using_reference_inside_an_object/pgsql/models/base/Contact.php b/tests/specs/issue_fix/163_generator_crash_when_using_reference_inside_an_object/pgsql/models/base/Contact.php
index 286cd404..6c9affb7 100644
--- a/tests/specs/issue_fix/163_generator_crash_when_using_reference_inside_an_object/pgsql/models/base/Contact.php
+++ b/tests/specs/issue_fix/163_generator_crash_when_using_reference_inside_an_object/pgsql/models/base/Contact.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "contacts".
  *
  * @property int $id
  *
diff --git a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php
index f3dae5db..e776fe40 100644
--- a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php
+++ b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Contact.php b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Contact.php
index 21a2e7f1..d670c7de 100644
--- a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Contact.php
+++ b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Contact.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/PaymentMethod.php b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/PaymentMethod.php
index 79e8c05b..8b3f3c64 100644
--- a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/PaymentMethod.php
+++ b/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/PaymentMethod.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php b/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php
index 0ee4adc0..b90b713b 100644
--- a/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php
+++ b/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/E123.php b/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/E123.php
index cbec768a..5ccfd9d0 100644
--- a/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/E123.php
+++ b/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/E123.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/quote_in_alter_table/pgsql/app/models/base/Fruit.php b/tests/specs/issue_fix/quote_in_alter_table/pgsql/app/models/base/Fruit.php
index 51d59253..063d8a69 100644
--- a/tests/specs/issue_fix/quote_in_alter_table/pgsql/app/models/base/Fruit.php
+++ b/tests/specs/issue_fix/quote_in_alter_table/pgsql/app/models/base/Fruit.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/many2many/models/base/Photo.php b/tests/specs/many2many/models/base/Photo.php
index eb08fec7..084ff2b9 100644
--- a/tests/specs/many2many/models/base/Photo.php
+++ b/tests/specs/many2many/models/base/Photo.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "photo".
  *
  * @property int $id
  * @property string $filename
diff --git a/tests/specs/many2many/models/base/Photos2Posts.php b/tests/specs/many2many/models/base/Photos2Posts.php
index 523ecada..e1175a23 100644
--- a/tests/specs/many2many/models/base/Photos2Posts.php
+++ b/tests/specs/many2many/models/base/Photos2Posts.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "photos2posts".
  *
  * @property int $id
  * @property int $photo_id
diff --git a/tests/specs/many2many/models/base/Post.php b/tests/specs/many2many/models/base/Post.php
index 6ecfc3ce..c802addc 100644
--- a/tests/specs/many2many/models/base/Post.php
+++ b/tests/specs/many2many/models/base/Post.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/many2many/models/base/PostsAttaches.php b/tests/specs/many2many/models/base/PostsAttaches.php
index 54b8adda..a2d3ca33 100644
--- a/tests/specs/many2many/models/base/PostsAttaches.php
+++ b/tests/specs/many2many/models/base/PostsAttaches.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "posts_attaches".
  *
  * @property int $id
  * @property int $attach_id
diff --git a/tests/specs/many2many/models/base/PostsGallery.php b/tests/specs/many2many/models/base/PostsGallery.php
index 61cfd67f..0fcbe6b8 100644
--- a/tests/specs/many2many/models/base/PostsGallery.php
+++ b/tests/specs/many2many/models/base/PostsGallery.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "posts_gallery".
  *
  * @property int $image_id
  * @property int $article_id
diff --git a/tests/specs/many2many/models/base/Tag.php b/tests/specs/many2many/models/base/Tag.php
index 8d7cfc24..16c0e038 100644
--- a/tests/specs/many2many/models/base/Tag.php
+++ b/tests/specs/many2many/models/base/Tag.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "tags".
  *
  * @property int $id
  * @property string $name
diff --git a/tests/specs/menu/models/base/Menu.php b/tests/specs/menu/models/base/Menu.php
index 582d952d..0d680fbf 100644
--- a/tests/specs/menu/models/base/Menu.php
+++ b/tests/specs/menu/models/base/Menu.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "menus".
  *
  * @property int $id
  * @property string $name
diff --git a/tests/specs/petstore/models/base/Pet.php b/tests/specs/petstore/models/base/Pet.php
index 039764d2..11996f08 100644
--- a/tests/specs/petstore/models/base/Pet.php
+++ b/tests/specs/petstore/models/base/Pet.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/petstore/models/base/Store.php b/tests/specs/petstore/models/base/Store.php
index b1f6bc0f..b450803e 100644
--- a/tests/specs/petstore/models/base/Store.php
+++ b/tests/specs/petstore/models/base/Store.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/petstore_arrayref/models/base/Pet.php b/tests/specs/petstore_arrayref/models/base/Pet.php
index 660237dd..2256302d 100644
--- a/tests/specs/petstore_arrayref/models/base/Pet.php
+++ b/tests/specs/petstore_arrayref/models/base/Pet.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/petstore_jsonapi/models/base/Pet.php b/tests/specs/petstore_jsonapi/models/base/Pet.php
index f0e3138a..cf242429 100644
--- a/tests/specs/petstore_jsonapi/models/base/Pet.php
+++ b/tests/specs/petstore_jsonapi/models/base/Pet.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/petstore_namespace/mymodels/base/Pet.php b/tests/specs/petstore_namespace/mymodels/base/Pet.php
index 58750645..aaa05081 100644
--- a/tests/specs/petstore_namespace/mymodels/base/Pet.php
+++ b/tests/specs/petstore_namespace/mymodels/base/Pet.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\mymodels\base;
 
 /**
diff --git a/tests/specs/petstore_namespace/mymodels/base/Store.php b/tests/specs/petstore_namespace/mymodels/base/Store.php
index 6ecc3e47..8ae6c907 100644
--- a/tests/specs/petstore_namespace/mymodels/base/Store.php
+++ b/tests/specs/petstore_namespace/mymodels/base/Store.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\mymodels\base;
 
 /**
diff --git a/tests/specs/petstore_wrapped/models/base/Pet.php b/tests/specs/petstore_wrapped/models/base/Pet.php
index fc84b808..9a51e269 100644
--- a/tests/specs/petstore_wrapped/models/base/Pet.php
+++ b/tests/specs/petstore_wrapped/models/base/Pet.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/petstore_xtable/models/base/Pet.php b/tests/specs/petstore_xtable/models/base/Pet.php
index fc84b808..9a51e269 100644
--- a/tests/specs/petstore_xtable/models/base/Pet.php
+++ b/tests/specs/petstore_xtable/models/base/Pet.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/postgres_custom/models/base/Custom.php b/tests/specs/postgres_custom/models/base/Custom.php
index ea4bd5f7..aa1eedd7 100644
--- a/tests/specs/postgres_custom/models/base/Custom.php
+++ b/tests/specs/postgres_custom/models/base/Custom.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "v3_pgcustom".
  *
  * @property int $id
  * @property int $num
diff --git a/tests/specs/relations_in_faker/app/models/base/A123.php b/tests/specs/relations_in_faker/app/models/base/A123.php
index 9836dc3b..58801cdc 100644
--- a/tests/specs/relations_in_faker/app/models/base/A123.php
+++ b/tests/specs/relations_in_faker/app/models/base/A123.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/relations_in_faker/app/models/base/Account.php b/tests/specs/relations_in_faker/app/models/base/Account.php
index 0ee4adc0..b90b713b 100644
--- a/tests/specs/relations_in_faker/app/models/base/Account.php
+++ b/tests/specs/relations_in_faker/app/models/base/Account.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/relations_in_faker/app/models/base/B123.php b/tests/specs/relations_in_faker/app/models/base/B123.php
index f05fe320..b2e60b06 100644
--- a/tests/specs/relations_in_faker/app/models/base/B123.php
+++ b/tests/specs/relations_in_faker/app/models/base/B123.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/relations_in_faker/app/models/base/C123.php b/tests/specs/relations_in_faker/app/models/base/C123.php
index faa3f1e5..611526d8 100644
--- a/tests/specs/relations_in_faker/app/models/base/C123.php
+++ b/tests/specs/relations_in_faker/app/models/base/C123.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/relations_in_faker/app/models/base/D123.php b/tests/specs/relations_in_faker/app/models/base/D123.php
index a6050a8a..c45d7214 100644
--- a/tests/specs/relations_in_faker/app/models/base/D123.php
+++ b/tests/specs/relations_in_faker/app/models/base/D123.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/relations_in_faker/app/models/base/Domain.php b/tests/specs/relations_in_faker/app/models/base/Domain.php
index 3f861f9e..f8c1b2f4 100644
--- a/tests/specs/relations_in_faker/app/models/base/Domain.php
+++ b/tests/specs/relations_in_faker/app/models/base/Domain.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/relations_in_faker/app/models/base/E123.php b/tests/specs/relations_in_faker/app/models/base/E123.php
index 6eb43814..9419135a 100644
--- a/tests/specs/relations_in_faker/app/models/base/E123.php
+++ b/tests/specs/relations_in_faker/app/models/base/E123.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/relations_in_faker/app/models/base/Routing.php b/tests/specs/relations_in_faker/app/models/base/Routing.php
index 71a31b81..f10bf829 100644
--- a/tests/specs/relations_in_faker/app/models/base/Routing.php
+++ b/tests/specs/relations_in_faker/app/models/base/Routing.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Alldbdatatype.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Alldbdatatype.php
index 6a35d601..4d0fe38b 100644
--- a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Alldbdatatype.php
+++ b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Alldbdatatype.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\mariamodel\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Editcolumn.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Editcolumn.php
index 62f98624..ee4bed5b 100644
--- a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Editcolumn.php
+++ b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Editcolumn.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\mariamodel\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Newcolumn.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Newcolumn.php
index 15da0af8..b7abc1fb 100644
--- a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Newcolumn.php
+++ b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Newcolumn.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\mariamodel\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Pristine.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Pristine.php
index a5d7c1ef..dba4f363 100644
--- a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Pristine.php
+++ b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Pristine.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\mariamodel\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Alldbdatatype.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Alldbdatatype.php
index 41326222..35dd25ef 100644
--- a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Alldbdatatype.php
+++ b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Alldbdatatype.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Editcolumn.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Editcolumn.php
index 2b630e67..242d7ec5 100644
--- a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Editcolumn.php
+++ b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Editcolumn.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Newcolumn.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Newcolumn.php
index 186ef3fe..444216ba 100644
--- a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Newcolumn.php
+++ b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Newcolumn.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Pristine.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Pristine.php
index 87c54d6c..1093d1f2 100644
--- a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Pristine.php
+++ b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Pristine.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Alldbdatatype.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Alldbdatatype.php
index 5311af96..c63f2aa7 100644
--- a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Alldbdatatype.php
+++ b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Alldbdatatype.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\pgsqlmodel\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Editcolumn.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Editcolumn.php
index 730bff5a..31dcc7ac 100644
--- a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Editcolumn.php
+++ b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Editcolumn.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\pgsqlmodel\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Newcolumn.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Newcolumn.php
index 09b54731..bc06c5bc 100644
--- a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Newcolumn.php
+++ b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Newcolumn.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\pgsqlmodel\base;
 
 /**
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Pristine.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Pristine.php
index c24d65b9..974f5e8d 100644
--- a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Pristine.php
+++ b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Pristine.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\pgsqlmodel\base;
 
 /**
diff --git a/tests/unit/AttributeResolverTest.php b/tests/unit/AttributeResolverTest.php
index ae07cdf7..204a1e65 100644
--- a/tests/unit/AttributeResolverTest.php
+++ b/tests/unit/AttributeResolverTest.php
@@ -114,6 +114,7 @@ public function testResolveRefNoObject()
         $model = $resolver->resolve();
         $fixture = require Yii::getAlias('@fixtures/non-db.php');
         $testModel = $fixture['personWatch'];
+        $testModel->openapiSchema = $model->openapiSchema;
         self::assertEquals($testModel, $model);
     }
 
@@ -126,6 +127,7 @@ public function testResolveNonDbModel()
         $model = $resolver->resolve();
         $fixture = require Yii::getAlias('@fixtures/non-db.php');
         $testModel = $fixture['PetStatistic'];
+        $testModel->openapiSchema = $model->openapiSchema;
         self::assertEquals($testModel, $model);
     }
 }