diff --git a/.idea/runConfigurations/All_Tests___Lint.xml b/.idea/runConfigurations/All_Tests___Lint.xml
index 1517360..3843cb0 100644
--- a/.idea/runConfigurations/All_Tests___Lint.xml
+++ b/.idea/runConfigurations/All_Tests___Lint.xml
@@ -17,7 +17,7 @@
     <method v="2">
       <option name="Make" enabled="true" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Lint" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Test All SQL" run_configuration_type="RunSql" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Test All SQL" run_configuration_type="DatabaseScript" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests___Lint__offline_.xml b/.idea/runConfigurations/All_Tests___Lint__offline_.xml
index 773010e..234a65f 100644
--- a/.idea/runConfigurations/All_Tests___Lint__offline_.xml
+++ b/.idea/runConfigurations/All_Tests___Lint__offline_.xml
@@ -19,7 +19,7 @@
     <method v="2">
       <option name="Make" enabled="true" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Lint" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Test All SQL" run_configuration_type="RunSql" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Test All SQL" run_configuration_type="DatabaseScript" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests__offline_.xml b/.idea/runConfigurations/All_Tests__offline_.xml
index 326e653..064f724 100644
--- a/.idea/runConfigurations/All_Tests__offline_.xml
+++ b/.idea/runConfigurations/All_Tests__offline_.xml
@@ -19,6 +19,7 @@
     <tag value="!online" />
     <method v="2">
       <option name="Make" enabled="true" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Test All SQL" run_configuration_type="DatabaseScript" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Article_Tests.xml b/.idea/runConfigurations/Article_Tests.xml
new file mode 100644
index 0000000..677d909
--- /dev/null
+++ b/.idea/runConfigurations/Article_Tests.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Article Tests" type="JUnit" factoryName="JUnit" show_console_on_std_err="true">
+    <output_file path="$PROJECT_DIR$/var/log/test/out.log" is_save="true" />
+    <module name="dcproject.test" />
+    <useClassPathOnly />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="RunCucumberTest" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="VM_PARAMETERS" value="-ea -Dcucumber.filter.tags=&quot;@article&quot; -Dstrict" />
+    <option name="PARAMETERS" value="" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="wholeProject" />
+    </option>
+    <envs>
+      <env name="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
+    </envs>
+    <dir value="$PROJECT_DIR$" />
+    <tag value="!online" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Clean_Dev_Database.xml b/.idea/runConfigurations/Clean_Dev_Database.xml
index 348e748..737e388 100644
--- a/.idea/runConfigurations/Clean_Dev_Database.xml
+++ b/.idea/runConfigurations/Clean_Dev_Database.xml
@@ -1,18 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clean Dev Database" type="RunSql" factoryName="Run SQL" folderName="SQL DEV">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
-      </list>
-    </option>
-    <option name="targets">
-      <list>
-        <Target>
-          <option name="dsId" value="28368159-3c2d-4612-8719-e55ce11b962a" />
-          <option name="namespace" value="database/&quot;dc-project&quot;/schema/&quot;public&quot;" />
-        </Target>
-      </list>
-    </option>
+  <configuration default="false" name="Clean Dev Database" type="DatabaseScript" folderName="SQL DEV">
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
+    <script-mode>FILE</script-mode>
+    <data-source id="28368159-3c2d-4612-8719-e55ce11b962a" namespace="database/&quot;dc-project&quot;" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Fixtures_on_Test.xml b/.idea/runConfigurations/Fixtures_on_Test.xml
index 7001cad..1edd808 100644
--- a/.idea/runConfigurations/Fixtures_on_Test.xml
+++ b/.idea/runConfigurations/Fixtures_on_Test.xml
@@ -1,28 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Fixtures on Test" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/01-user.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/02-citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/03-workgroup.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/04-article.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/05-constitution.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/06-follow.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/07-comment.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/08-vote.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/09-opinion.sql" />
-      </list>
-    </option>
-    <option name="targets">
-      <list>
-        <Target>
-          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
-          <option name="namespace" value="database/&quot;test&quot;/schema/&quot;public&quot;" />
-        </Target>
-      </list>
-    </option>
+  <configuration default="false" name="Fixtures on Test" type="DatabaseScript" folderName="SQL TEST">
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/01-user.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/02-citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/03-workgroup.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/04-article.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/05-constitution.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/06-follow.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/07-comment.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/08-vote.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/09-opinion.sql" />
+    <script-mode>FILE</script-mode>
+    <data-source id="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" namespace="database/&quot;test&quot;/schema/&quot;public&quot;" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml b/.idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
index a7f5e98..aeb3e40 100644
--- a/.idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
+++ b/.idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
@@ -34,7 +34,7 @@
     <method v="2">
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All Tests + Lint" run_configuration_type="JUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Sonarqube" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset database schema and import Fixtures" run_configuration_type="RunSql" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset database schema and import Fixtures" run_configuration_type="DatabaseScript" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Reset_DB___Run.xml b/.idea/runConfigurations/Reset_DB___Run.xml
index d019b97..705a494 100644
--- a/.idea/runConfigurations/Reset_DB___Run.xml
+++ b/.idea/runConfigurations/Reset_DB___Run.xml
@@ -32,7 +32,7 @@
     </extension>
     <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset database schema and import Fixtures" run_configuration_type="RunSql" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Clean Dev Database" run_configuration_type="DatabaseScript" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Reset_Test_database.xml b/.idea/runConfigurations/Reset_Test_database.xml
index daaf1de..cd24697 100644
--- a/.idea/runConfigurations/Reset_Test_database.xml
+++ b/.idea/runConfigurations/Reset_Test_database.xml
@@ -1,19 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Reset Test database" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
-      </list>
-    </option>
-    <option name="targets">
-      <list>
-        <Target>
-          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
-          <option name="namespace" value="database/&quot;test&quot;/schema/&quot;public&quot;" />
-        </Target>
-      </list>
-    </option>
+  <configuration default="false" name="Reset Test database" type="DatabaseScript" folderName="SQL TEST">
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
+    <script-mode>FILE</script-mode>
+    <data-source id="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" namespace="database/&quot;test&quot;/schema/&quot;public&quot;" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml b/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml
index 1c1a9eb..98cfacf 100644
--- a/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml
+++ b/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml
@@ -1,28 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Reset database schema and import Fixtures" type="RunSql" factoryName="Run SQL" folderName="SQL DEV">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/01-user.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/02-citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/03-workgroup.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/04-article.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/05-constitution.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/06-follow.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/07-comment.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/08-vote.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/fixtures/09-opinion.sql" />
-      </list>
-    </option>
-    <option name="targets">
-      <list>
-        <Target>
-          <option name="dsId" value="28368159-3c2d-4612-8719-e55ce11b962a" />
-          <option name="namespace" value="database/&quot;dc-project&quot;/schema/&quot;public&quot;" />
-        </Target>
-      </list>
-    </option>
+  <configuration default="false" name="Reset database schema and import Fixtures" type="DatabaseScript" folderName="SQL DEV">
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/01-user.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/02-citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/03-workgroup.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/04-article.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/05-constitution.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/06-follow.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/07-comment.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/08-vote.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/fixtures/09-opinion.sql" />
+    <script-mode>FILE</script-mode>
+    <data-source id="28368159-3c2d-4612-8719-e55ce11b962a" namespace="database/&quot;dc-project&quot;" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
deleted file mode 100644
index 73f5920..0000000
--- a/.idea/runConfigurations/Test.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="SEND_GRID_KEY" value="$SEND_GRID_KEY$" />
-        </map>
-      </option>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_All_SQL.xml b/.idea/runConfigurations/Test_All_SQL.xml
index 4084752..91b3691 100644
--- a/.idea/runConfigurations/Test_All_SQL.xml
+++ b/.idea/runConfigurations/Test_All_SQL.xml
@@ -1,80 +1,70 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test All SQL" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_article_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_articles.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_articles_versions_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_articles_versions_by_version_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_last_article_by_version_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/upsert_article.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_email.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_id_with_user.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_user_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_username.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizens.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/insert_citizen_with_user.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/upsert_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/comment.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/edit_comment.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comment_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comments_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comments_by_parent.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comments_by_target.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/create_title_in_constitution.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitution_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitution_title_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitution_titles_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitutions.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/upsert_constitution.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_constitution_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/follow.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/unfollow.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/helpers/find_reference_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/helpers/random_between.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/count_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/upsert_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/user/change_user_password.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/user/check_user.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/user/find_user_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/user/find_user_by_username.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/user/insert_user.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/vote.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/count_vote.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/find_citizen_votes_by_target_ids.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/find_votes_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/count_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_ids.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_by_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choice_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choices.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/upsert_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/user.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/citizen.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/article.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/constitution.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/comment.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/follow.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/vote.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/opinion.sql" />
-      </list>
-    </option>
-    <option name="targets">
-      <list>
-        <Target>
-          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
-          <option name="namespace" value="database/&quot;test&quot;/schema/&quot;public&quot;" />
-        </Target>
-      </list>
-    </option>
+  <configuration default="false" name="Test All SQL" type="DatabaseScript" folderName="SQL TEST" editBeforeRun="true">
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.down.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/migrations/0000-init_schema.up.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_article_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_articles.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_articles_versions_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_articles_versions_by_version_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_last_article_by_version_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/article/upsert_article.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_email.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_id_with_user.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_user_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizen_by_username.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/find_citizens.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/insert_citizen_with_user.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/citizen/upsert_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/comment.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/edit_comment.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comment_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comments_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comments_by_parent.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/comment/find_comments_by_target.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/create_title_in_constitution.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitution_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitution_title_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitution_titles_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/find_constitutions.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/constitution/upsert_constitution.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_constitution_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/follow.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/unfollow.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/helpers/find_reference_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/helpers/random_between.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/count_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/upsert_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/user/change_user_password.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/user/check_user.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/user/find_user_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/user/find_user_by_username.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/user/insert_user.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/vote.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/count_vote.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/find_citizen_votes_by_target_ids.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/vote/find_votes_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/count_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_ids.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_by_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choice_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choices.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/upsert_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/user.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/article.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/constitution.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/comment.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/follow.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/vote.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/opinion.sql" />
+    <script-mode>FILE</script-mode>
+    <data-source id="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" namespace="database/&quot;test&quot;/schema/&quot;public&quot;" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_Follow.xml b/.idea/runConfigurations/Test_Follow.xml
index 3c538f3..5b88876 100644
--- a/.idea/runConfigurations/Test_Follow.xml
+++ b/.idea/runConfigurations/Test_Follow.xml
@@ -1,27 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Follow" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follow.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_target.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_constitution_by_citizen.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/follow.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/unfollow.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/follow.sql" />
-      </list>
-    </option>
-    <option name="targets">
-      <list>
-        <Target>
-          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
-          <option name="namespace" value="database/&quot;test&quot;" />
-        </Target>
-      </list>
-    </option>
+  <configuration default="false" name="Test Follow" type="DatabaseScript" folderName="SQL TEST">
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follow.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_article_by_target.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/find_follows_constitution_by_citizen.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/follow.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/follow/unfollow.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/follow.sql" />
+    <script-mode>FILE</script-mode>
+    <data-source id="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" namespace="database/&quot;test&quot;/schema/&quot;public&quot;" />
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset Test database" run_configuration_type="RunSql" />
+      <option name="RunConfigurationTask" enabled="true" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_Opinions.xml b/.idea/runConfigurations/Test_Opinions.xml
index 1322ba8..2c59f4e 100644
--- a/.idea/runConfigurations/Test_Opinions.xml
+++ b/.idea/runConfigurations/Test_Opinions.xml
@@ -1,29 +1,19 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Opinions" type="RunSql" factoryName="Run SQL" folderName="SQL TEST">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_article_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/count_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_ids.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choice_by_id.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choices.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/upsert_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_by_opinion.sql" />
-        <option value="$PROJECT_DIR$/src/test/sql/opinion.sql" />
-      </list>
-    </option>
-    <option name="targets">
-      <list>
-        <Target>
-          <option name="dsId" value="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" />
-          <option name="namespace" value="database/&quot;test&quot;/schema/&quot;public&quot;" />
-        </Target>
-      </list>
-    </option>
+  <configuration default="false" name="Test Opinions" type="DatabaseScript" folderName="SQL TEST">
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/article/find_article_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/count_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_citizen_opinions_by_target_ids.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choice_by_id.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_choices.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/upsert_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/find_opinion_by_opinion.sql" />
+    <script-file value="$PROJECT_DIR$/src/test/sql/opinion.sql" />
+    <script-mode>FILE</script-mode>
+    <data-source id="a9a6d0e9-327d-4e7d-9b93-3cb6f7948866" namespace="database/&quot;test&quot;/schema/&quot;public&quot;" />
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset Test database" run_configuration_type="RunSql" />
+      <option name="RunConfigurationTask" enabled="true" />
     </method>
   </configuration>
 </component>
\ No newline at end of file