diff --git a/.idea/misc.xml b/.idea/misc.xml
index cb31dbb..ad1f18e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="adopt-openjdk-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests___Lint.xml b/.idea/runConfigurations/All_Tests___Lint.xml
index 43f669d..ad48e1e 100644
--- a/.idea/runConfigurations/All_Tests___Lint.xml
+++ b/.idea/runConfigurations/All_Tests___Lint.xml
@@ -18,7 +18,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="DatabaseScript" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Test All SQL" run_configuration_type="ShConfigurationType" />
     </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 2433f66..b0e28ac 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="DatabaseScript" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Test All SQL" run_configuration_type="ShConfigurationType" />
     </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
deleted file mode 100644
index 737e388..0000000
--- a/.idea/runConfigurations/Clean_Dev_Database.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <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/Cucumber_Tests__offline_.xml b/.idea/runConfigurations/Cucumber_Tests__offline_.xml
index faa46ab..5c7d3d1 100644
--- a/.idea/runConfigurations/Cucumber_Tests__offline_.xml
+++ b/.idea/runConfigurations/Cucumber_Tests__offline_.xml
@@ -25,7 +25,6 @@
     <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/Fixtures_on_Test.xml b/.idea/runConfigurations/Fixtures_on_Test.xml
deleted file mode 100644
index c835ed6..0000000
--- a/.idea/runConfigurations/Fixtures_on_Test.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Fixtures on Test" type="DatabaseScript" folderName="SQL TEST">
-    <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">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Reset Test database" run_configuration_type="DatabaseScript" />
-    </method>
-  </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___Run.xml
similarity index 83%
rename from .idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
rename to .idea/runConfigurations/Lint_Test_Sonar___Run.xml
index aeb3e40..e5c1ebe 100644
--- a/.idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
+++ b/.idea/runConfigurations/Lint_Test_Sonar___Run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Lint+Test+Sonar, Reset DB &amp; Run" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Lint+Test+Sonar &amp; Run" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="env">
         <map>
@@ -34,7 +34,6 @@
     <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="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
deleted file mode 100644
index 705a494..0000000
--- a/.idea/runConfigurations/Reset_DB___Run.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Reset DB &amp; Run" 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="run" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
-      </ENTRIES>
-    </extension>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2">
-      <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
deleted file mode 100644
index cd24697..0000000
--- a/.idea/runConfigurations/Reset_Test_database.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <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
deleted file mode 100644
index 98cfacf..0000000
--- a/.idea/runConfigurations/Reset_database_schema_and_import_Fixtures.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <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/SQL_Tests.xml b/.idea/runConfigurations/SQL_Tests.xml
deleted file mode 100644
index ba4355d..0000000
--- a/.idea/runConfigurations/SQL_Tests.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="SQL Tests" type="ShConfigurationType">
-    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/src/test/sql/test.sh" />
-    <option name="SCRIPT_OPTIONS" value="" />
-    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src/test/sql" />
-    <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
-    <option name="INTERPRETER_PATH" value="C:/Program Files/Git/bin/bash.exe" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Start_App.xml b/.idea/runConfigurations/Start_App.xml
index 091b8e1..4fd60cc 100644
--- a/.idea/runConfigurations/Start_App.xml
+++ b/.idea/runConfigurations/Start_App.xml
@@ -19,6 +19,8 @@
         <option name="sourceFilePath" value="docker-compose.yml" />
       </settings>
     </deployment>
-    <method v="2" />
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Build without test" run_configuration_type="GradleRunConfiguration" />
+    </method>
   </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 ee76818..b336211 100644
--- a/.idea/runConfigurations/Test_All_SQL.xml
+++ b/.idea/runConfigurations/Test_All_SQL.xml
@@ -1,86 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test All SQL" 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/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_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_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/main/resources/sql/functions/opinion/upsert_opinion_choice.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/opinion/update_citizen_opinions_by_target_id.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/add_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/delete_workgroup.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/find_workgroup_by_id.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/find_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/find_workgroups.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/remove_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/update_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/upsert_workgroup.sql" />
-    <script-file value="$PROJECT_DIR$/src/test/sql/fixtures/fixture_user.sql" />
-    <script-file value="$PROJECT_DIR$/src/test/sql/fixtures/fixture_citizen.sql" />
-    <script-file value="$PROJECT_DIR$/src/test/sql/fixtures/fixture_article.sql" />
-    <script-file value="$PROJECT_DIR$/src/test/sql/fixtures/fixture_workgroup.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-file value="$PROJECT_DIR$/src/test/sql/workgroup.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="DatabaseScript" />
-    </method>
+  <configuration default="false" name="Test All SQL" type="ShConfigurationType">
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/src/test/sql/test.sh" />
+    <option name="SCRIPT_OPTIONS" value="1" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/src/test/sql" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
+    <option name="INTERPRETER_PATH" value="C:/Program Files/Git/bin/bash.exe" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <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
deleted file mode 100644
index fe3e336..0000000
--- a/.idea/runConfigurations/Test_Follow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <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="DatabaseScript" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_Opinions.xml b/.idea/runConfigurations/Test_Opinions.xml
deleted file mode 100644
index b148158..0000000
--- a/.idea/runConfigurations/Test_Opinions.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <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/main/resources/sql/functions/opinion/upsert_opinion_choice.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="DatabaseScript" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test_Workgroup.xml b/.idea/runConfigurations/Test_Workgroup.xml
deleted file mode 100644
index 4b2f478..0000000
--- a/.idea/runConfigurations/Test_Workgroup.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Workgroup" type="DatabaseScript" folderName="SQL TEST">
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/find_workgroup_by_id.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/find_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/find_workgroups.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/upsert_workgroup.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/add_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/remove_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/main/resources/sql/functions/workgroup/update_workgroup_members.sql" />
-    <script-file value="$PROJECT_DIR$/src/test/sql/workgroup.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="DatabaseScript" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/src/test/sql/test.sh b/src/test/sql/test.sh
index 13cccaf..385a299 100644
--- a/src/test/sql/test.sh
+++ b/src/test/sql/test.sh
@@ -1,33 +1,43 @@
 #!/bin/bash
 
-PS3='Please enter your choice: '
-options=("RESET DB" "All" "article" "citizen" "comment" "constitution" "follow" "opinion" "user" "vote" "workgroup" "Quit")
-select opt in "${options[@]}"
-do
-    case $opt in
-        "RESET DB")
-            cat \
-              ../../main/resources/sql/migrations/*.down.sql \
-              ../../main/resources/sql/migrations/*.up.sql > ./allSQL.sql
-            docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
-            rm ./allSQL.sql
-            break;;
-        "All")
-            cat ../../main/resources/sql/functions/*/*.sql \
-              ./fixtures/*.sql \
-              ./*.sql > ./allSQL.sql
-            docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
-            rm ./allSQL.sql
-            break;;
-        "Quit")
-            break;;
-        *) echo "Start tests $opt"
-            cat ../../main/resources/sql/functions/*/*.sql \
-              ./fixtures/*.sql \
-              ./"$opt".sql > ./allSQL.sql
-            docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
-            rm ./allSQL.sql
-            break;;
-    esac
-done
+options=("All" "article" "citizen" "comment" "constitution" "follow" "opinion" "user" "vote" "workgroup" "RESET DB" "Quit")
+if [ -z "$1" ]; then
+  PS3='Please enter your choice: '
+  select ch in "${options[@]}"
+  do
+    opt=$ch
+    break
+  done
+else
+  opt=${options[${1}-1]}
+fi
 
+case $opt in
+  "RESET DB")
+      awk 'FNR==1{print "--------------------"}1' \
+        ../../main/resources/sql/migrations/*.down.sql \
+        ../../main/resources/sql/migrations/*.up.sql > ./allSQL.sql
+      docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+      rm ./allSQL.sql
+      ;;
+  "All")
+      echo "Start ALL tests"
+      awk 'FNR==1{print "--------------------"}1' \
+        ../../main/resources/sql/functions/*/*.sql \
+        ./fixtures/*.sql \
+        ./*.sql > ./allSQL.sql
+      docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+      rm ./allSQL.sql
+      ;;
+  "Quit")
+      ;;
+  *)
+    echo "Start tests $opt"
+    awk 'FNR==1{print "--------------------"}1' \
+      ../../main/resources/sql/functions/*/*.sql \
+      ./fixtures/*.sql \
+      ./"$opt".sql > ./allSQL.sql
+    docker exec -i postgresql_dc-project psql test test -q -b -v "ON_ERROR_STOP=1" < ./allSQL.sql
+    rm ./allSQL.sql
+    ;;
+esac
\ No newline at end of file