diff --git a/lib/iban_ex/country/bg.ex b/lib/iban_ex/country/bg.ex
index fc123aa..5e04486 100644
--- a/lib/iban_ex/country/bg.ex
+++ b/lib/iban_ex/country/bg.ex
@@ -1,4 +1,6 @@
 defmodule IbanEx.Country.BG do
+  # TODO Bulgaria IBAN contains account type (first 2 digits of account number)
+
   @moduledoc """
   Bulgaria IBAN parsing rules
 
diff --git a/lib/iban_ex/country/is.ex b/lib/iban_ex/country/is.ex
index d6c9159..73c1683 100644
--- a/lib/iban_ex/country/is.ex
+++ b/lib/iban_ex/country/is.ex
@@ -1,5 +1,5 @@
 defmodule IbanEx.Country.IS do
-  # !TODO Iceland IBAN contains identification number (last 10 digits of account number)
+  # TODO Iceland IBAN contains identification number (last 10 digits of account number)
 
   @moduledoc """
   Island IBAN parsing rules
diff --git a/test/iban_ex_validator_test.exs b/test/iban_ex_validator_test.exs
index b5b8b31..c32d013 100644
--- a/test/iban_ex_validator_test.exs
+++ b/test/iban_ex_validator_test.exs
@@ -98,71 +98,17 @@ defmodule IbanExValidatorTest do
       {"AZ21NABZ0000000013701000944", true},
       # invalid characters (leters) in number
       {"AT6119043002A4573201", true},
-      {"BH67BMAG000012991A3456", true}
-      # {"BE68539007547034", true},
-      # {"BA391290079401028494", true},
-      # {"BR1800360305000010009795493C1", true},
-      # {"BG80BNBG96611020345678", true},
-      # {"CR05015202001026284066", true},
-      # {"HR1210010051863000160", true},
-      # {"CY17002001280000001200527600", true},
-      # {"CZ6508000000192000145399", true},
-      # {"DK5000400440116243", true},
-      # {"DO28BAGR00000001212453611324", true},
-      # {"EG380019000500000000263180002", true},
-      # {"SV62CENR00000000000000700025", true},
-      # {"EE382200221020145685", true},
-      # {"FO6264600001631634", true},
-      # {"FI2112345600000785", true},
-      # {"FR1420041010050500013M02606", true},
-      # {"GE29NB0000000101904917", true},
-      # {"DE89370400440532013000", true},
-      # {"GI75NWBK000000007099453", true},
-      # {"GR1601101250000000012300695", true},
-      # {"GL8964710001000206", true},
-      # {"GT82TRAJ01020000001210029690", true},
-      # {"HU42117730161111101800000000", true},
-      # {"IS140159260076545510730339", true},
-      # {"IE29AIBK93115212345678", true},
-      # {"IL620108000000099999999", true},
-      # {"IT60X0542811101000000123456", true},
-      # {"JO94CBJO0010000000000131000302", true},
-      # {"KZ86125KZT5004100100", true},
-      # {"XK051212012345678906", true},
-      # {"KW81CBKU0000000000001234560101", true},
-      # {"LV80BANK0000435195001", true},
-      # {"LB62099900000001001901229114", true},
-      # {"LI21088100002324013AA", true},
-      # {"LT121000011101001000", true},
-      # {"LU280019400644750000", true},
-      # {"MK07250120000058984", true},
-      # {"MT84MALT011000012345MTLCAST001S", true},
-      # {"MR1300020001010000123456753", true},
-      # {"MC5811222000010123456789030", true},
-      # {"ME25505000012345678951", true},
-      # {"NL91ABNA0417164300", true},
-      # {"NO9386011117947", true},
-      # {"PK36SCBL0000001123456702", true},
-      # {"PL61109010140000071219812874", true},
-      # {"PT50000201231234567890154", true},
-      # {"QA58DOHB00001234567890ABCDEFG", true},
-      # {"MD24AG000225100013104168", true},
-      # {"RO49AAAA1B31007593840000", true},
-      # {"SM86U0322509800000000270100", true},
-      # {"SA0380000000608010167519", true},
-      # {"RS35260005601001611379", true},
-      # {"SK3112000000198742637541", true},
-      # {"SI56263300012039086", true},
-      # {"ES9121000418450200051332", true},
-      # {"SE4550000000058398257466", true},
-      # {"CH9300762011623852957", true},
-      # {"TL380080012345678910157", true},
-      # {"TR330006100519786457841326", true},
-      # {"UA213223130000026007233566001", true},
-      # {"AE070331234567890123456", true},
-      # {"GB29NWBK60161331926819", true},
-      # {"VA59001123000012345678", true},
-      # {"VG96VPVG0000012345678901", true}
+      {"BH67BMAG000012991A3456", true},
+      {"BE685390075X7034", true},
+      {"BA391290079401S28494", true},
+      {"BR180036030500001000979549CC1", true},
+      {"HR12100100518630001", true},
+      # shorter then need and has
+      # invalid characters (leters) in number
+      {"BR18003603050000100097CC1", true},
+      {"CR050152020010262806Ї", true},
+      # FIXME it is invalid IBAN for Bulgaria — need to change a rules function in Country Template module
+      # {"BG80BNBG9661102034567Ї", true},
     ]
 
     Enum.all?(cases, fn {iban, result} ->