diff --git a/src/test/groovy/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntitySpec.groovy b/src/test/groovy/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntitySpec.groovy
index 1d5de23..d660488 100644
--- a/src/test/groovy/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntitySpec.groovy
+++ b/src/test/groovy/space/kklochko/jdbc_hospital_example/cli/commands/CommandEntitySpec.groovy
@@ -8,6 +8,8 @@ import space.kklochko.jdbc_hospital_example.db.factories.DataBaseConnection
 import space.kklochko.jdbc_hospital_example.db.repositories.DepartmentRepository
 import space.kklochko.jdbc_hospital_example.db.repositories.IndicatorRepository
 import space.kklochko.jdbc_hospital_example.db.repositories.PatientRepository
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.CreateTables
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.TurnOnUUIDPlugin
 import space.kklochko.jdbc_hospital_example.models.Indicator
 import spock.lang.Shared
 import spock.lang.Specification
@@ -31,8 +33,11 @@ class CommandEntitySpec extends Specification {
         db = (new LoadDataBaseConfigFromEnvFile()).load("db.testing")
         dbc = new DataBaseConnection(db)
 
-        IndicatorRepository repo = new IndicatorRepository(dbc)
-        repo.createTable()
+        TurnOnUUIDPlugin turnOnUUIDPlugin = new TurnOnUUIDPlugin()
+        turnOnUUIDPlugin.create(dbc)
+
+        CreateTables createTables = new CreateTables()
+        createTables.create(dbc)
 
         sql = Sql.newInstance(db.getUrl(), db.getProperties().get("user"), db.getProperties().get("password"))
     }
diff --git a/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/DepartmentRepositorySpec.groovy b/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/DepartmentRepositorySpec.groovy
index d5ddafd..5f23524 100644
--- a/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/DepartmentRepositorySpec.groovy
+++ b/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/DepartmentRepositorySpec.groovy
@@ -4,6 +4,8 @@ import groovy.sql.Sql
 import space.kklochko.jdbc_hospital_example.config.factories.LoadDataBaseConfigFromEnvFile
 import space.kklochko.jdbc_hospital_example.config.models.DataBaseConfig
 import space.kklochko.jdbc_hospital_example.db.factories.DataBaseConnection
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.CreateTables
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.TurnOnUUIDPlugin
 import space.kklochko.jdbc_hospital_example.models.Department
 import spock.lang.Shared
 import spock.lang.Specification
@@ -25,8 +27,11 @@ class DepartmentRepositorySpec extends Specification {
         db = (new LoadDataBaseConfigFromEnvFile()).load("db.testing")
         dbc = new DataBaseConnection(db)
 
-        DepartmentRepository repo = new DepartmentRepository(dbc)
-        repo.createTable()
+        TurnOnUUIDPlugin turnOnUUIDPlugin = new TurnOnUUIDPlugin()
+        turnOnUUIDPlugin.create(dbc)
+
+        CreateTables createTables = new CreateTables()
+        createTables.create(dbc)
 
         sql = Sql.newInstance(db.getUrl(), db.getProperties().get("user"), db.getProperties().get("password"))
 
diff --git a/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/IndicatorRepositorySpec.groovy b/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/IndicatorRepositorySpec.groovy
index 3c5d308..ea1230f 100644
--- a/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/IndicatorRepositorySpec.groovy
+++ b/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/IndicatorRepositorySpec.groovy
@@ -4,6 +4,8 @@ import groovy.sql.Sql
 import space.kklochko.jdbc_hospital_example.config.factories.LoadDataBaseConfigFromEnvFile
 import space.kklochko.jdbc_hospital_example.config.models.DataBaseConfig
 import space.kklochko.jdbc_hospital_example.db.factories.DataBaseConnection
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.CreateTables
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.TurnOnUUIDPlugin
 import space.kklochko.jdbc_hospital_example.models.Indicator
 import spock.lang.Shared
 import spock.lang.Specification
@@ -28,8 +30,11 @@ class IndicatorRepositorySpec extends Specification {
         db = (new LoadDataBaseConfigFromEnvFile()).load("db.testing")
         dbc = new DataBaseConnection(db)
 
-        IndicatorRepository repo = new IndicatorRepository(dbc)
-        repo.createTable()
+        TurnOnUUIDPlugin turnOnUUIDPlugin = new TurnOnUUIDPlugin()
+        turnOnUUIDPlugin.create(dbc)
+
+        CreateTables createTables = new CreateTables()
+        createTables.create(dbc)
 
         sql = Sql.newInstance(db.getUrl(), db.getProperties().get("user"), db.getProperties().get("password"))
 
diff --git a/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/PatientRepositorySpec.groovy b/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/PatientRepositorySpec.groovy
index 3b24a1a..231a9c0 100644
--- a/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/PatientRepositorySpec.groovy
+++ b/src/test/groovy/space/kklochko/jdbc_hospital_example/db/repositories/PatientRepositorySpec.groovy
@@ -4,6 +4,8 @@ import groovy.sql.Sql
 import space.kklochko.jdbc_hospital_example.config.factories.LoadDataBaseConfigFromEnvFile
 import space.kklochko.jdbc_hospital_example.config.models.DataBaseConfig
 import space.kklochko.jdbc_hospital_example.db.factories.DataBaseConnection
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.CreateTables
+import space.kklochko.jdbc_hospital_example.db.repositories.blocks.TurnOnUUIDPlugin
 import space.kklochko.jdbc_hospital_example.models.Patient
 import spock.lang.Shared
 import spock.lang.Specification
@@ -25,8 +27,11 @@ class PatientRepositorySpec extends Specification {
         db = (new LoadDataBaseConfigFromEnvFile()).load("db.testing")
         dbc = new DataBaseConnection(db)
 
-        PatientRepository repo = new PatientRepository(dbc)
-        repo.createTable()
+        TurnOnUUIDPlugin turnOnUUIDPlugin = new TurnOnUUIDPlugin()
+        turnOnUUIDPlugin.create(dbc)
+
+        CreateTables createTables = new CreateTables()
+        createTables.create(dbc)
 
         sql = Sql.newInstance(db.getUrl(), db.getProperties().get("user"), db.getProperties().get("password"))