diff --git a/conf/cmi/language/en/webform.webform.hyte_yleisavustus.yml b/conf/cmi/language/en/webform.webform.hyte_yleisavustus.yml
index 71e89f43f..ccc44651e 100644
--- a/conf/cmi/language/en/webform.webform.hyte_yleisavustus.yml
+++ b/conf/cmi/language/en/webform.webform.hyte_yleisavustus.yml
@@ -82,7 +82,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': ' Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
@@ -116,7 +115,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml b/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
index 4a52088f1..baaa170e5 100644
--- a/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
+++ b/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
@@ -82,7 +82,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml b/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
index 9b176e554..566f1b029 100644
--- a/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
+++ b/conf/cmi/language/en/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
@@ -84,7 +84,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': ' Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.kaupunginkanslia_tyollisyysavust.yml b/conf/cmi/language/en/webform.webform.kaupunginkanslia_tyollisyysavust.yml
index 4061c225c..a46e04307 100644
--- a/conf/cmi/language/en/webform.webform.kaupunginkanslia_tyollisyysavust.yml
+++ b/conf/cmi/language/en/webform.webform.kaupunginkanslia_tyollisyysavust.yml
@@ -85,7 +85,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
@@ -119,7 +118,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.kuva_projekti.yml b/conf/cmi/language/en/webform.webform.kuva_projekti.yml
index 25b02d5ff..ba2f2050b 100644
--- a/conf/cmi/language/en/webform.webform.kuva_projekti.yml
+++ b/conf/cmi/language/en/webform.webform.kuva_projekti.yml
@@ -104,7 +104,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': ' Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.kuva_toiminta.yml b/conf/cmi/language/en/webform.webform.kuva_toiminta.yml
index 44d3d0a7e..ce138a5ff 100644
--- a/conf/cmi/language/en/webform.webform.kuva_toiminta.yml
+++ b/conf/cmi/language/en/webform.webform.kuva_toiminta.yml
@@ -119,7 +119,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.liikunta_laitosavustushakemus.yml b/conf/cmi/language/en/webform.webform.liikunta_laitosavustushakemus.yml
index 088d568ab..a4b7d1562 100644
--- a/conf/cmi/language/en/webform.webform.liikunta_laitosavustushakemus.yml
+++ b/conf/cmi/language/en/webform.webform.liikunta_laitosavustushakemus.yml
@@ -82,7 +82,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
@@ -116,7 +115,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.liikunta_toiminta_ja_tilankaytto.yml b/conf/cmi/language/en/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
index 59405d65b..0761b948d 100644
--- a/conf/cmi/language/en/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
+++ b/conf/cmi/language/en/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
@@ -102,7 +102,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.nuorisotoiminta_projektiavustush.yml b/conf/cmi/language/en/webform.webform.nuorisotoiminta_projektiavustush.yml
index e0dcf1f65..be997d96c 100644
--- a/conf/cmi/language/en/webform.webform.nuorisotoiminta_projektiavustush.yml
+++ b/conf/cmi/language/en/webform.webform.nuorisotoiminta_projektiavustush.yml
@@ -82,7 +82,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': ' Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
@@ -115,7 +114,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.nuortoimpalkka.yml b/conf/cmi/language/en/webform.webform.nuortoimpalkka.yml
index a2275448d..63a9f395b 100644
--- a/conf/cmi/language/en/webform.webform.nuortoimpalkka.yml
+++ b/conf/cmi/language/en/webform.webform.nuortoimpalkka.yml
@@ -83,7 +83,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
@@ -117,7 +116,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml b/conf/cmi/language/en/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
index 6a02c17a6..1445e29f0 100644
--- a/conf/cmi/language/en/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
+++ b/conf/cmi/language/en/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
@@ -126,7 +126,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': ' Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.taide_ja_kulttuuriavustukset_tai.yml b/conf/cmi/language/en/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
index 38bae8720..7f97d89e9 100644
--- a/conf/cmi/language/en/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
+++ b/conf/cmi/language/en/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
@@ -91,7 +91,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.yleisavustushakemus.yml b/conf/cmi/language/en/webform.webform.yleisavustushakemus.yml
index 9460ee28c..3c9378bc8 100644
--- a/conf/cmi/language/en/webform.webform.yleisavustushakemus.yml
+++ b/conf/cmi/language/en/webform.webform.yleisavustushakemus.yml
@@ -80,7 +80,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
@@ -114,7 +113,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/en/webform.webform.ymparistopalvelut_yleisavustus.yml b/conf/cmi/language/en/webform.webform.ymparistopalvelut_yleisavustus.yml
index 7ec7f0db9..8bbdf3a77 100644
--- a/conf/cmi/language/en/webform.webform.ymparistopalvelut_yleisavustus.yml
+++ b/conf/cmi/language/en/webform.webform.ymparistopalvelut_yleisavustus.yml
@@ -83,7 +83,6 @@ elements: |
           3: EU
           4: Other
           5: Foundation
-          6: STEA
         '#title': 'Grant issuer'
       issuer_name:
         '#title': 'Issuer''s name'
diff --git a/conf/cmi/language/sv/webform.webform.hyte_yleisavustus.yml b/conf/cmi/language/sv/webform.webform.hyte_yleisavustus.yml
index c19f2645b..4f1a00f00 100644
--- a/conf/cmi/language/sv/webform.webform.hyte_yleisavustus.yml
+++ b/conf/cmi/language/sv/webform.webform.hyte_yleisavustus.yml
@@ -85,7 +85,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
@@ -119,7 +118,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml b/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
index cfc0cd296..568dfd85b 100644
--- a/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
+++ b/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
@@ -85,7 +85,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml b/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
index fa0f7d4b5..435b9a590 100644
--- a/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
+++ b/conf/cmi/language/sv/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
@@ -87,7 +87,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.kaupunginkanslia_tyollisyysavust.yml b/conf/cmi/language/sv/webform.webform.kaupunginkanslia_tyollisyysavust.yml
index 7d24e07b6..b1bd2a72a 100644
--- a/conf/cmi/language/sv/webform.webform.kaupunginkanslia_tyollisyysavust.yml
+++ b/conf/cmi/language/sv/webform.webform.kaupunginkanslia_tyollisyysavust.yml
@@ -88,7 +88,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
@@ -122,7 +121,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.kuva_projekti.yml b/conf/cmi/language/sv/webform.webform.kuva_projekti.yml
index 2962bcbd2..16930ff1b 100644
--- a/conf/cmi/language/sv/webform.webform.kuva_projekti.yml
+++ b/conf/cmi/language/sv/webform.webform.kuva_projekti.yml
@@ -107,7 +107,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.kuva_toiminta.yml b/conf/cmi/language/sv/webform.webform.kuva_toiminta.yml
index 417f26721..40d69cdbd 100644
--- a/conf/cmi/language/sv/webform.webform.kuva_toiminta.yml
+++ b/conf/cmi/language/sv/webform.webform.kuva_toiminta.yml
@@ -121,7 +121,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.liikunta_laitosavustushakemus.yml b/conf/cmi/language/sv/webform.webform.liikunta_laitosavustushakemus.yml
index 363a343e4..7c3b12d8d 100644
--- a/conf/cmi/language/sv/webform.webform.liikunta_laitosavustushakemus.yml
+++ b/conf/cmi/language/sv/webform.webform.liikunta_laitosavustushakemus.yml
@@ -85,7 +85,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
@@ -119,7 +118,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.liikunta_toiminta_ja_tilankaytto.yml b/conf/cmi/language/sv/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
index 92016a206..2acd6606d 100644
--- a/conf/cmi/language/sv/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
+++ b/conf/cmi/language/sv/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
@@ -107,7 +107,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.nuorisotoiminta_projektiavustush.yml b/conf/cmi/language/sv/webform.webform.nuorisotoiminta_projektiavustush.yml
index d7cdb0433..8e3c9497f 100644
--- a/conf/cmi/language/sv/webform.webform.nuorisotoiminta_projektiavustush.yml
+++ b/conf/cmi/language/sv/webform.webform.nuorisotoiminta_projektiavustush.yml
@@ -86,7 +86,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
@@ -119,7 +118,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.nuortoimpalkka.yml b/conf/cmi/language/sv/webform.webform.nuortoimpalkka.yml
index 67e710adc..970d0e699 100644
--- a/conf/cmi/language/sv/webform.webform.nuortoimpalkka.yml
+++ b/conf/cmi/language/sv/webform.webform.nuortoimpalkka.yml
@@ -86,7 +86,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
@@ -120,7 +119,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml b/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
index ecf8d4620..62fdc5fe8 100644
--- a/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
+++ b/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
@@ -129,7 +129,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuriavustukset_tai.yml b/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
index 51e4b97aa..7327233be 100644
--- a/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
+++ b/conf/cmi/language/sv/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
@@ -94,7 +94,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.yleisavustushakemus.yml b/conf/cmi/language/sv/webform.webform.yleisavustushakemus.yml
index 67f569e28..25fe61efc 100644
--- a/conf/cmi/language/sv/webform.webform.yleisavustushakemus.yml
+++ b/conf/cmi/language/sv/webform.webform.yleisavustushakemus.yml
@@ -85,7 +85,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
@@ -119,7 +118,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/language/sv/webform.webform.ymparistopalvelut_yleisavustus.yml b/conf/cmi/language/sv/webform.webform.ymparistopalvelut_yleisavustus.yml
index 4832d6732..c7fddcabf 100644
--- a/conf/cmi/language/sv/webform.webform.ymparistopalvelut_yleisavustus.yml
+++ b/conf/cmi/language/sv/webform.webform.ymparistopalvelut_yleisavustus.yml
@@ -87,7 +87,6 @@ elements: |
           3: EU
           4: Övrig
           5: Fundament
-          6: STEA
         '#title': Bidragsgivare
       issuer_name:
         '#title': 'Emittentens namn'
diff --git a/conf/cmi/webform.webform.asukasosallisuus_pienavustushake.yml b/conf/cmi/webform.webform.asukasosallisuus_pienavustushake.yml
index 2fbfa8523..e3583b6ee 100644
--- a/conf/cmi/webform.webform.asukasosallisuus_pienavustushake.yml
+++ b/conf/cmi/webform.webform.asukasosallisuus_pienavustushake.yml
@@ -265,7 +265,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -354,7 +353,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.asukasosallisuus_yleis_ja_toimin.yml b/conf/cmi/webform.webform.asukasosallisuus_yleis_ja_toimin.yml
index 594b01da1..c7aa00384 100644
--- a/conf/cmi/webform.webform.asukasosallisuus_yleis_ja_toimin.yml
+++ b/conf/cmi/webform.webform.asukasosallisuus_yleis_ja_toimin.yml
@@ -271,7 +271,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -360,7 +359,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.elderly_sports_and_culture.yml b/conf/cmi/webform.webform.elderly_sports_and_culture.yml
index 727b1593c..f47562bb0 100644
--- a/conf/cmi/webform.webform.elderly_sports_and_culture.yml
+++ b/conf/cmi/webform.webform.elderly_sports_and_culture.yml
@@ -351,7 +351,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -440,7 +439,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.hyte_yleisavustus.yml b/conf/cmi/webform.webform.hyte_yleisavustus.yml
index 75267ef5c..2450bdf09 100644
--- a/conf/cmi/webform.webform.hyte_yleisavustus.yml
+++ b/conf/cmi/webform.webform.hyte_yleisavustus.yml
@@ -309,7 +309,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml b/conf/cmi/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
index 8ba573d9b..4f44ff90a 100644
--- a/conf/cmi/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
+++ b/conf/cmi/webform.webform.kasvatus_ja_koulutus_toiminta_av.yml
@@ -313,7 +313,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml b/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
index e9992f05f..c0ff3ce26 100644
--- a/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
+++ b/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml
@@ -319,7 +319,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.kaupunginkanslia_tyollisyysavust.yml b/conf/cmi/webform.webform.kaupunginkanslia_tyollisyysavust.yml
index cb1c7ccd4..1070f3f13 100644
--- a/conf/cmi/webform.webform.kaupunginkanslia_tyollisyysavust.yml
+++ b/conf/cmi/webform.webform.kaupunginkanslia_tyollisyysavust.yml
@@ -318,7 +318,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -407,7 +406,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.kuva_projekti.yml b/conf/cmi/webform.webform.kuva_projekti.yml
index b72a931f4..c68ba11f3 100644
--- a/conf/cmi/webform.webform.kuva_projekti.yml
+++ b/conf/cmi/webform.webform.kuva_projekti.yml
@@ -385,7 +385,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.kuva_toiminta.yml b/conf/cmi/webform.webform.kuva_toiminta.yml
index 8dd86f607..b5978324f 100644
--- a/conf/cmi/webform.webform.kuva_toiminta.yml
+++ b/conf/cmi/webform.webform.kuva_toiminta.yml
@@ -440,7 +440,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.liikunta_laitosavustushakemus.yml b/conf/cmi/webform.webform.liikunta_laitosavustushakemus.yml
index 7ee910e8d..219c12af3 100644
--- a/conf/cmi/webform.webform.liikunta_laitosavustushakemus.yml
+++ b/conf/cmi/webform.webform.liikunta_laitosavustushakemus.yml
@@ -322,7 +322,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -411,7 +410,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.liikunta_toiminta_ja_tilankaytto.yml b/conf/cmi/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
index 31e6a6125..615a789c9 100644
--- a/conf/cmi/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
+++ b/conf/cmi/webform.webform.liikunta_toiminta_ja_tilankaytto.yml
@@ -452,7 +452,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.nuorisotoiminta_projektiavustush.yml b/conf/cmi/webform.webform.nuorisotoiminta_projektiavustush.yml
index 502b59739..063b7b230 100644
--- a/conf/cmi/webform.webform.nuorisotoiminta_projektiavustush.yml
+++ b/conf/cmi/webform.webform.nuorisotoiminta_projektiavustush.yml
@@ -342,7 +342,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -429,7 +428,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.nuortoimpalkka.yml b/conf/cmi/webform.webform.nuortoimpalkka.yml
index df748255a..345e7e163 100644
--- a/conf/cmi/webform.webform.nuortoimpalkka.yml
+++ b/conf/cmi/webform.webform.nuortoimpalkka.yml
@@ -367,7 +367,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -456,7 +455,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.performance_test_webform.yml b/conf/cmi/webform.webform.performance_test_webform.yml
index 97e84dce4..a64de203b 100644
--- a/conf/cmi/webform.webform.performance_test_webform.yml
+++ b/conf/cmi/webform.webform.performance_test_webform.yml
@@ -125,7 +125,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
@@ -214,7 +213,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml b/conf/cmi/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
index 0da0e9533..de9456b7e 100644
--- a/conf/cmi/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
+++ b/conf/cmi/webform.webform.taide_ja_kulttuuri_kehittamisavu.yml
@@ -363,7 +363,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml b/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
index 85d272c13..7387ded3b 100644
--- a/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
+++ b/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml
@@ -346,7 +346,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/conf/cmi/webform.webform.ymparistopalvelut_yleisavustus.yml b/conf/cmi/webform.webform.ymparistopalvelut_yleisavustus.yml
index f310eb36e..9d57d1198 100644
--- a/conf/cmi/webform.webform.ymparistopalvelut_yleisavustus.yml
+++ b/conf/cmi/webform.webform.ymparistopalvelut_yleisavustus.yml
@@ -314,7 +314,6 @@ elements: |-
               3: EU
               4: Muu
               5: Säätiö
-              6: STEA
             '#required': true
             '#title': 'Avustuksen myöntäjä'
           issuer_name:
diff --git a/public/modules/custom/grants_handler/grants_handler.module b/public/modules/custom/grants_handler/grants_handler.module
index ca838b7b9..d8680f8d6 100644
--- a/public/modules/custom/grants_handler/grants_handler.module
+++ b/public/modules/custom/grants_handler/grants_handler.module
@@ -648,6 +648,31 @@ function _grants_handler_alter_number_fields(&$element): void {
   }
 }
 
+/**
+ * Function to update custom component dropdown value rather than via config.
+ *
+ * @param array $form
+ *   The form.
+ *
+ * @return void
+ *   No return?
+ */
+function grants_handler__update_issuer_dropdown(array &$form): void {
+
+  $tOpts = ['context' => 'Grant Issuers'];
+
+  $newOptions = [
+    1 => t('State', [], $tOpts),
+    3 => t('EU', [], $tOpts),
+    4 => t('Other', [], $tOpts),
+    5 => t('Foundation', [], $tOpts),
+  ];
+
+  // Call the method with multiple field names.
+  ApplicationHelpers::updateFieldOptions($form, $newOptions, ['myonnetty_avustus', 'issuer']);
+  ApplicationHelpers::updateFieldOptions($form, $newOptions, ['haettu_avustus_tieto', 'issuer']);
+}
+
 /**
  * Implements hook_form_FORM_ID_alter().
  */
@@ -667,6 +692,7 @@ function grants_handler_webform_submission_form_alter(&$form, FormStateInterface
   $form['actions']['wizard_next']['#validate'][] = '::noValidate';
 
   _grants_handler_alter_number_fields($form);
+  grants_handler__update_issuer_dropdown($form);
 
   $grants_formnavigation_helper = \Drupal::service('grants_handler.navigation_helper');
   $all_errors = [];
diff --git a/public/modules/custom/grants_handler/phpunit.xml b/public/modules/custom/grants_handler/phpunit.xml
index fd7672ac5..ec1307b36 100644
--- a/public/modules/custom/grants_handler/phpunit.xml
+++ b/public/modules/custom/grants_handler/phpunit.xml
@@ -1,44 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-  bootstrap="../../../core/tests/bootstrap.php"
-  colors="true"
-  cacheResultFile=".phpunit.cache/test-results"
-  executionOrder="depends,defects"
-  forceCoversAnnotation="true"
-  beStrictAboutTestsThatDoNotTestAnything="true"
-  beStrictAboutOutputDuringTests="true"
-  beStrictAboutChangesToGlobalState="true"
-  beStrictAboutCoversAnnotation="true"
-  printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter"
-  failOnRisky="true"
-  failOnWarning="true"
-  verbose="true">
-<php>
-  <!-- Set error reporting to E_ALL. -->
-  <ini name="error_reporting" value="32767"/>
-  <!-- Do not limit the amount of memory tests take to run. -->
-  <ini name="memory_limit" value="-1"/>
-  <const name="PHPUNIT_GRANTS_TESTSUITE" value="true"/>
-  <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--disable-gpu","--headless", "--no-sandbox"]}}, "http://127.0.0.1:4444"]' />
-</php>
-<testsuites>
-  <testsuite name="kernel">
-    <directory>./tests/src/Kernel</directory>
-  </testsuite>
-</testsuites>
-<listeners>
-  <listener class="\Drupal\Tests\Listeners\DrupalListener">
-  </listener>
-</listeners>
-<coverage cacheDirectory=".phpunit.cache/code-coverage" processUncoveredFiles="true">
-  <include>
-    <directory suffix=".php">./src</directory>
-    <file>./*.module</file>
-  </include>
-  <report>
-    <html outputDirectory="html-coverage" lowUpperBound="50" highLowerBound="90"/>
-    <clover outputFile="./clover-coverage.xml"/>
-  </report>
-</coverage>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         bootstrap="../../../core/tests/bootstrap.php"
+         colors="true"
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutCoversAnnotation="true"
+         printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
+  <php>
+    <!-- Set error reporting to E_ALL. -->
+    <ini name="error_reporting" value="32767"/>
+    <!-- Do not limit the amount of memory tests take to run. -->
+    <ini name="memory_limit" value="-1"/>
+    <const name="PHPUNIT_GRANTS_TESTSUITE" value="true"/>
+    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--disable-gpu","--headless", "--no-sandbox"]}}, "http://127.0.0.1:4444"]' />
+  </php>
+  <testsuites>
+    <testsuite name="kernel">
+      <directory>./tests/src/Kernel</directory>
+    </testsuite>
+    <testsuite name="unit">
+      <directory>./tests/src/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <listeners>
+    <listener class="\Drupal\Tests\Listeners\DrupalListener">
+    </listener>
+  </listeners>
+  <coverage cacheDirectory=".phpunit.cache/code-coverage" processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+      <file>./*.module</file>
+    </include>
+    <report>
+      <html outputDirectory="html-coverage" lowUpperBound="50" highLowerBound="90"/>
+      <clover outputFile="./clover-coverage.xml"/>
+    </report>
+  </coverage>
 </phpunit>
diff --git a/public/modules/custom/grants_handler/src/ApplicationGetterService.php b/public/modules/custom/grants_handler/src/ApplicationGetterService.php
index 8e04eb45e..0372e01b8 100644
--- a/public/modules/custom/grants_handler/src/ApplicationGetterService.php
+++ b/public/modules/custom/grants_handler/src/ApplicationGetterService.php
@@ -336,7 +336,7 @@ public function submissionObjectFromApplicationNumber(
     }
 
     // Load definition.
-    $dataDefinition = ApplicationHelpers::getDataDefinition($document->getType());
+    $dataDefinition = $this->getDataDefinition($document->getType());
 
     // Build data.
     $sData = DocumentContentMapper::documentContentToTypedData(
@@ -357,6 +357,18 @@ public function submissionObjectFromApplicationNumber(
     return $submissionObject;
   }
 
+  /**
+   * Get data definition class from application type.
+   *
+   * @param string $type
+   *   Type of the application.
+   */
+  public function getDataDefinition(string $type) {
+    $defClass = Helpers::getApplicationTypes()[$type]['dataDefinition']['definitionClass'];
+    $defId = Helpers::getApplicationTypes()[$type]['dataDefinition']['definitionId'];
+    return $defClass::create($defId);
+  }
+
   /**
    * Extract webform id from application number string.
    *
diff --git a/public/modules/custom/grants_handler/src/ApplicationHelpers.php b/public/modules/custom/grants_handler/src/ApplicationHelpers.php
index ae7ca2219..110f4c5a6 100644
--- a/public/modules/custom/grants_handler/src/ApplicationHelpers.php
+++ b/public/modules/custom/grants_handler/src/ApplicationHelpers.php
@@ -35,11 +35,12 @@ public static function createApplicationNumber(WebformSubmission &$submission, $
     $appParam = Helpers::getAppEnv();
 
     $serial = $submission->serial();
-    $applicationType = $submission->getWebform()
-      ->getThirdPartySetting('grants_metadata', 'applicationType');
 
-    $applicationTypeId = $submission->getWebform()
-      ->getThirdPartySetting('grants_metadata', 'applicationTypeID');
+    $webform = $submission->getWebform();
+    $third_party_settings = $webform->getThirdPartySettings('grants_metadata');
+
+    $applicationType = $third_party_settings['applicationType'] ?? NULL;
+    $applicationTypeId = $third_party_settings['applicationTypeID'] ?? NULL;
 
     if ($useOldFormat) {
       return self::getApplicationNumberInEnvFormatOldFormat($appParam, $applicationType, $serial);
@@ -67,8 +68,10 @@ public static function getAvailableApplicationNumber(WebformSubmission &$submiss
     $appParam = Helpers::getAppEnv();
     $serial = $submission->serial();
     $webform_id = $submission->getWebform()->id();
-    $applicationTypeId = $submission->getWebform()
-      ->getThirdPartySetting('grants_metadata', 'applicationTypeID');
+
+    $thirdPartySettings = $submission->getWebform()->getThirdPartySettings('grants_metadata');
+
+    $applicationTypeId = $thirdPartySettings['applicationTypeID'] ?? NULL;
 
     $lastSerialKey = $applicationTypeId . '_' . $appParam;
     $kvService = \Drupal::service('keyvalue.database');
@@ -120,7 +123,7 @@ public static function getAvailableApplicationNumber(WebformSubmission &$submiss
   /**
    * Format application number based by the enviroment.
    */
-  private static function getApplicationNumberInEnvFormat($appParam, $typeId, $serial): string {
+  protected static function getApplicationNumberInEnvFormat($appParam, $typeId, $serial): string {
     $applicationNumber = $appParam . '-' .
       str_pad($typeId, 3, '0', STR_PAD_LEFT) . '-' .
       str_pad($serial, 7, '0', STR_PAD_LEFT);
@@ -136,7 +139,7 @@ private static function getApplicationNumberInEnvFormat($appParam, $typeId, $ser
   /**
    * Format application number based by the enviroment in old format.
    */
-  private static function getApplicationNumberInEnvFormatOldFormat($appParam, $typeId, $serial): string {
+  protected static function getApplicationNumberInEnvFormatOldFormat($appParam, $typeId, $serial): string {
     $applicationNumber = 'GRANTS-' . $appParam . '-' . $typeId . '-' . sprintf('%08d', $serial);
 
     if ($appParam == 'PROD') {
@@ -185,7 +188,9 @@ public static function hasBreakingChangesInNewerVersion(Webform $webform): bool
       return $map[$uuid];
     }
 
-    $applicationType = $webform->getThirdPartySetting('grants_metadata', 'applicationType');
+    $thirdPartySettingsWebform = $webform->getThirdPartySettings('grants_metadata');
+
+    $applicationType = $thirdPartySettingsWebform['applicationType'] ?? NULL;
 
     $latestApplicationForm = self::getLatestApplicationForm($applicationType);
 
@@ -194,8 +199,9 @@ public static function hasBreakingChangesInNewerVersion(Webform $webform): bool
       return FALSE;
     }
 
-    $parent = $latestApplicationForm->getThirdPartySetting('grants_metadata', 'parent');
-    $hasBreakingChanges = $latestApplicationForm->getThirdPartySetting('grants_metadata', 'avus2BreakingChange');
+    $thirdPartySettingsLatest = $webform->getThirdPartySettings('grants_metadata');
+    $parent = $thirdPartySettingsLatest['parent'] ?? NULL;
+    $hasBreakingChanges = $thirdPartySettingsLatest['avus2BreakingChange'] ?? NULL;
 
     while (!empty($parent)) {
       $map[$parent] = $hasBreakingChanges;
@@ -207,12 +213,14 @@ public static function hasBreakingChangesInNewerVersion(Webform $webform): bool
         ]);
 
       $wf = reset($loaded_webform);
-      $parent = $wf->getThirdPartySetting('grants_metadata', 'parent');
+
+      $thirdPartySettingsLatest = $wf->getThirdPartySettings('grants_metadata');
+      $parent = $thirdPartySettingsLatest['parent'] ?? NULL;
 
       // No need to check the flag,
       // if we already have a newer version with breaking changes.
       if (!$hasBreakingChanges) {
-        $hasBreakingChanges = $wf->getThirdPartySetting('grants_metadata', 'avus2BreakingChange');
+        $hasBreakingChanges = $thirdPartySettingsLatest['avus2BreakingChange'] ?? NULL;
       }
     }
 
@@ -280,18 +288,6 @@ public static function getWebformFromApplicationNumber(string $applicationNumber
     return reset($webform);
   }
 
-  /**
-   * Get data definition class from application type.
-   *
-   * @param string $type
-   *   Type of the application.
-   */
-  public static function getDataDefinition(string $type) {
-    $defClass = Helpers::getApplicationTypes()[$type]['dataDefinition']['definitionClass'];
-    $defId = Helpers::getApplicationTypes()[$type]['dataDefinition']['definitionId'];
-    return $defClass::create($defId);
-  }
-
   /**
    * Tries to find latest webform for given application ID.
    *
@@ -391,4 +387,44 @@ public static function isApplicationWebformDuplicatable(string $id, string $form
     return count($applicationForms['released']) <= 1 && count($applicationForms['development']) === 0;
   }
 
+  /**
+   * Update field options in a form array.
+   *
+   * This method is used to update the options of a field in a form array.
+   *
+   * @param array $form
+   *   The form array.
+   * @param array $newOptions
+   *   The new options to set.
+   * @param array $fieldStructure
+   *   The structure of the field.
+   */
+  public static function updateFieldOptions(array &$form, array $newOptions, array $fieldStructure): void {
+    $currentField = &$form;
+
+    // Traverse the form array based on the field structure.
+    foreach ($fieldStructure as $fieldName) {
+      if (isset($currentField[$fieldName])) {
+        $currentField = &$currentField[$fieldName];
+      }
+      elseif (isset($currentField['#element'][$fieldName])) {
+        $currentField = &$currentField['#element'][$fieldName];
+      }
+      else {
+        // If the field is not found, continue searching recursively.
+        foreach ($currentField as &$subField) {
+          if (is_array($subField)) {
+            self::updateFieldOptions($subField, $newOptions, $fieldStructure);
+          }
+        }
+        return;
+      }
+    }
+
+    // Update the #options if the field with '#options' is found.
+    if (isset($currentField['#options'])) {
+      $currentField['#options'] = $newOptions;
+    }
+  }
+
 }
diff --git a/public/modules/custom/grants_handler/tests/src/Unit/ApplicationHelpersExposed.php b/public/modules/custom/grants_handler/tests/src/Unit/ApplicationHelpersExposed.php
new file mode 100644
index 000000000..4837bd0c1
--- /dev/null
+++ b/public/modules/custom/grants_handler/tests/src/Unit/ApplicationHelpersExposed.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\Tests\grants_handler\Unit;
+
+use Drupal\grants_handler\ApplicationHelpers;
+
+/**
+ * A subclass to expose protected methods for testing.
+ */
+class ApplicationHelpersExposed extends ApplicationHelpers {
+
+  /**
+   * Expose the protected method getApplicationNumberInEnvFormatOldFormat.
+   *
+   * @param string $appParam
+   *   The application parameter.
+   * @param string $typeId
+   *   The type ID.
+   * @param string $serial
+   *   The serial number.
+   *
+   * @return string
+   *   The application number in the old format.
+   */
+  public static function exposedGetApplicationNumberInEnvFormatOldFormat(string $appParam, string $typeId, string $serial): string {
+    return self::getApplicationNumberInEnvFormatOldFormat($appParam, $typeId, $serial);
+  }
+
+  /**
+   * Expose the protected method getApplicationNumberInEnvFormat.
+   *
+   * @param string $appParam
+   *   The application parameter.
+   * @param string $typeId
+   *   The type ID.
+   * @param string $serial
+   *   The serial number.
+   *
+   * @return string
+   *   The application number in the new format.
+   */
+  public static function exposedGetApplicationNumberInEnvFormat(string $appParam, string $typeId, string $serial) {
+    return self::getApplicationNumberInEnvFormat($appParam, $typeId, $serial);
+  }
+
+}
diff --git a/public/modules/custom/grants_handler/tests/src/Unit/ApplicationHelpersTest.php b/public/modules/custom/grants_handler/tests/src/Unit/ApplicationHelpersTest.php
new file mode 100644
index 000000000..d28682c94
--- /dev/null
+++ b/public/modules/custom/grants_handler/tests/src/Unit/ApplicationHelpersTest.php
@@ -0,0 +1,250 @@
+<?php
+
+namespace Drupal\Tests\grants_handler\Unit;
+
+use Drupal\grants_handler\ApplicationHelpers;
+use Drupal\Tests\UnitTestCase;
+use Drupal\webform\Entity\Webform;
+use Drupal\webform\Entity\WebformSubmission;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @coversDefaultClass \Drupal\grants_handler\ApplicationHelpers
+ * @group grants_handler
+ */
+class ApplicationHelpersTest extends UnitTestCase {
+
+  /**
+   * Example of setting up the environment in the test case.
+   */
+  public function setUp(): void {
+    parent::setUp();
+    // Set the environment variable to the expected value.
+    putenv('APP_ENV=ENV');
+  }
+
+  /**
+   * Test the setFieldOptions method.
+   *
+   * @covers \Drupal\grants_handler\ApplicationHelpers::updateFieldOptions
+   */
+  public function testUpdateFieldOptions() {
+    $form = [
+      "elements" => [
+        "2_avustustiedot" => [
+          "muut_samaan_tarkoitukseen_myonnetyt_avustukset" => [
+            "myonnetty_avustus" => [
+              "#element" => [
+                "issuer" => [
+                  "#options" => [],
+                ],
+              ],
+            ],
+          ],
+          "muut_samaan_tarkoitukseen_haetut_avustukset" => [
+            "haettu_avustus_tieto" => [
+              "#element" => [
+                "issuer" => [
+                  "#options" => [],
+                ],
+              ],
+            ],
+          ],
+        ],
+      ],
+    ];
+
+    $fieldStructureMyonnetty = [
+      'myonnetty_avustus',
+      'issuer',
+    ];
+
+    $fieldStructureHaettu = [
+      'haettu_avustus_tieto',
+      'issuer',
+    ];
+
+    $newOptions = [
+      1 => 'State',
+      3 => 'EU',
+      4 => 'Other',
+      5 => 'Foundation',
+    ];
+
+    // Test with a single field name.
+    ApplicationHelpers::updateFieldOptions($form, $newOptions, $fieldStructureMyonnetty);
+    $this->assertEquals($newOptions,
+      $form['elements']['2_avustustiedot']['muut_samaan_tarkoitukseen_myonnetyt_avustukset']['myonnetty_avustus']['#element']['issuer']['#options']);
+
+    ApplicationHelpers::updateFieldOptions($form, $newOptions, $fieldStructureHaettu);
+    $this->assertEquals($newOptions,
+      $form['elements']['2_avustustiedot']['muut_samaan_tarkoitukseen_haetut_avustukset']['haettu_avustus_tieto']['#element']['issuer']['#options']);
+
+  }
+
+  /**
+   * Test the createApplicationNumber method.
+   *
+   * @covers ::createApplicationNumber
+   * @covers ::getApplicationNumberInEnvFormat
+   * @covers ::getApplicationNumberInEnvFormatOldFormat
+   * @covers \Drupal\grants_handler\Helpers::getAppEnv
+   */
+  public function testCreateApplicationNumber() {
+    // Set the environment variable to the expected value.
+    putenv('APP_ENV=ENV');
+
+    $webform = $this->createMock(Webform::class);
+    $webform->method('getThirdPartySettings')
+      ->will($this->onConsecutiveCalls(
+        [
+          'applicationType' => 'TYPE',
+          'applicationTypeID' => '001',
+        ],
+        [
+          'applicationType' => 'TYPE',
+          'applicationTypeID' => '001',
+        ],
+        [
+          'applicationType' => 'TYPE',
+          'applicationTypeID' => '001',
+        ],
+        [
+          'applicationType' => 'TYPE',
+          'applicationTypeID' => '001',
+        ],
+        [
+          'applicationType' => 'NEWTYPE',
+          'applicationTypeID' => '002',
+        ]
+      ));
+
+    $submission = $this->createMock(WebformSubmission::class);
+    $submission->method('serial')->will($this->onConsecutiveCalls(123, 123, 456, 456, 456, 456));
+    $submission->method('getWebform')->willReturn($webform);
+
+    // Ensure the method is called with the correct parameters.
+    $this->assertEquals('ENV-001-0000123', ApplicationHelpers::createApplicationNumber($submission, FALSE));
+    $this->assertEquals('GRANTS-ENV-TYPE-00000123', ApplicationHelpers::createApplicationNumber($submission, TRUE));
+
+    // Test with different serial numbers.
+    $this->assertEquals('ENV-001-0000456', ApplicationHelpers::createApplicationNumber($submission, FALSE));
+    $this->assertEquals('GRANTS-ENV-TYPE-00000456', ApplicationHelpers::createApplicationNumber($submission, TRUE));
+
+    $this->assertEquals('ENV-002-0000456', ApplicationHelpers::createApplicationNumber($submission, FALSE));
+  }
+
+  /**
+   * Test the getSerialFromApplicationNumber method.
+   *
+   * @covers ::getSerialFromApplicationNumber
+   */
+  public function testGetSerialFromApplicationNumber() {
+    $applicationNumber = 'ENV-001-0000123';
+    $result = ApplicationHelpers::getSerialFromApplicationNumber($applicationNumber);
+    $this->assertEquals('123', $result);
+
+    // Test with invalid application number.
+    $applicationNumber = 'INVALID45633465';
+    $result = ApplicationHelpers::getSerialFromApplicationNumber($applicationNumber);
+    $this->assertEquals($result, $applicationNumber);
+  }
+
+  /**
+   * @covers ::getApplicationNumberInEnvFormat
+   */
+  public function testGetApplicationNumberInEnvFormat() {
+    $appParam = 'ENV';
+    $typeId = '001';
+    $serial = 123;
+
+    $expected = 'ENV-001-0000123';
+    $this->assertEquals($expected, ApplicationHelpersExposed::exposedGetApplicationNumberInEnvFormat($appParam, $typeId, $serial));
+
+    $appParam = 'PROD';
+    $expected = '001-0000123';
+    $this->assertEquals($expected, ApplicationHelpersExposed::exposedGetApplicationNumberInEnvFormat($appParam, $typeId, $serial));
+  }
+
+  /**
+   * @covers ::getApplicationNumberInEnvFormatOldFormat
+   */
+  public function testGetApplicationNumberInEnvFormatOldFormat() {
+    $appParam = 'ENV';
+    $typeId = 'TYPE';
+    $serial = 123;
+
+    $expected = 'GRANTS-ENV-TYPE-00000123';
+    $this->assertEquals($expected, ApplicationHelpersExposed::exposedGetApplicationNumberInEnvFormatOldFormat($appParam, $typeId, $serial));
+
+    $appParam = 'PROD';
+    $expected = 'GRANTS-TYPE-00000123';
+    $this->assertEquals($expected, ApplicationHelpersExposed::exposedGetApplicationNumberInEnvFormatOldFormat($appParam, $typeId, $serial));
+  }
+
+  /**
+   * Test the hasBreakingChangesInNewerVersion method.
+   *
+   * @covers ::hasBreakingChangesInNewerVersion
+   * @covers Drupal\grants_handler\ApplicationHelpers::getLatestApplicationForm
+   */
+  public function testHasBreakingChangesInNewerVersion() {
+    // Mock the Webform entity.
+    $webform = $this->createMock(Webform::class);
+    $webform->method('uuid')->willReturn('parent-uuid');
+    $webform->method('getThirdPartySettings')
+      ->with('grants_metadata')
+      ->will($this->onConsecutiveCalls(
+        [
+          'applicationType' => 'test-application-type',
+        ],
+        [
+          'parent' => 'parent-uuid',
+          'avus2BreakingChange' => TRUE,
+        ],
+        [
+          'parent' => 'parent-uuid',
+          'avus2BreakingChange' => TRUE,
+        ],
+        [
+          'parent' => 'parent-uuid',
+          'avus2BreakingChange' => TRUE,
+        ],
+        [
+          'parent' => 'parent-uuid',
+          'avus2BreakingChange' => TRUE,
+        ]
+      ));
+
+    // Mock the entity type manager and storage.
+    $entityTypeManager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface');
+    $webformStorage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
+    $entityTypeManager->method('getStorage')
+      ->with('webform')
+      ->willReturn($webformStorage);
+
+    // Mock the loading of webforms.
+    $webformStorage->method('loadByProperties')
+      ->willReturn([$webform]);
+
+    // Set the entity type manager service.
+    \Drupal::setContainer(new ContainerBuilder());
+    \Drupal::getContainer()->set('entity_type.manager', $entityTypeManager);
+
+    // Call the method and assert the result.
+    $result = ApplicationHelpers::hasBreakingChangesInNewerVersion($webform);
+    $this->assertTrue($result);
+
+  }
+
+  /**
+   * Test the getAvailableApplicationNumber method.
+   *
+   * @covers \Drupal\grants_handler\ApplicationHelpers::getAvailableApplicationNumber
+   */
+  public function testGetAvailableApplicationNumber() {
+
+    // Can't get this one to work...
+  }
+
+}
diff --git a/public/modules/custom/grants_handler/tests/src/Unit/ApplicationValidatorTest.php b/public/modules/custom/grants_handler/tests/src/Unit/ApplicationValidatorTest.php
index 4fc471b54..6c96fbeb8 100644
--- a/public/modules/custom/grants_handler/tests/src/Unit/ApplicationValidatorTest.php
+++ b/public/modules/custom/grants_handler/tests/src/Unit/ApplicationValidatorTest.php
@@ -70,6 +70,11 @@ protected function setUp(): void {
 
   /**
    * Test for validateApplication.
+   *
+   * @covers \Drupal\grants_handler\ApplicationValidator::processViolation
+   * @covers \Drupal\grants_handler\ApplicationValidator::__construct
+   * @covers \Drupal\grants_handler\ApplicationValidator::handleOtherViolation
+   * @covers \Drupal\grants_handler\ApplicationValidator::handleViolation
    */
   public function testProcessViolation(): void {
     $violation = $this->createMock(ConstraintViolationInterface::class);