diff --git a/TestVectors/kalyna.txt b/TestVectors/kalyna.txt
index 59ae2b8c..6829c7a0 100644
--- a/TestVectors/kalyna.txt
+++ b/TestVectors/kalyna.txt
@@ -6,7 +6,7 @@ Key: 000102030405060708090A0B0C0D0E0F
 BlockSize: 16
 Plaintext: 101112131415161718191A1B1C1D1E1F
 Ciphertext: 81BF1C7D779BAC20E1C9EA39B4D2AD06
-Test: EncryptBlockSize
+Test: Encrypt
 Name: Kalyna/ECB
 Source: Kalyna reference implementation
 Comment: Kalyna 256-bit key, 128-bit block
@@ -14,7 +14,7 @@ Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
 BlockSize: 16
 Plaintext: 202122232425262728292A2B2C2D2E2F
 Ciphertext: 58EC3E091000158A1148F7166F334F14
-Test: EncryptBlockSize
+Test: Encrypt
 Name: Kalyna/ECB
 Source: Kalyna reference implementation
 Comment: Kalyna 256-bit key, 256-bit block
@@ -22,7 +22,7 @@ Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
 BlockSize: 32
 Plaintext: 202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F
 Ciphertext: F66E3D570EC92135AEDAE323DCBD2A8CA03963EC206A0D5A88385C24617FD92C
-Test: EncryptBlockSize
+Test: Encrypt
 Name: Kalyna/ECB
 Source: Kalyna reference implementation
 Comment: Kalyna 512-bit key, 256-bit block
@@ -30,7 +30,7 @@ Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242
 BlockSize: 32
 Plaintext: 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
 Ciphertext: 606990E9E6B7B67A4BD6D893D72268B78E02C83C3CD7E102FD2E74A8FDFE5DD9
-Test: EncryptBlockSize
+Test: Encrypt
 Name: Kalyna/ECB
 Source: Kalyna reference implementation
 Comment: Kalyna 512-bit key, 512-bit block
@@ -38,4 +38,71 @@ Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242
 BlockSize: 64
 Plaintext: 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F
 Ciphertext: 4A26E31B811C356AA61DD6CA0596231A67BA8354AA47F3A13E1DEEC320EB56B895D0F417175BAB662FD6F134BB15C86CCB906A26856EFEB7C5BC6472940DD9D9
-Test: EncryptBlockSize
+Test: Encrypt
+Name: Kalyna/CBC
+Source: DSTU 7624:2014, Section B.6.1 (p.148)
+Comment: Kalyna 128-bit key, 128-bit block
+Key: 000102030405060708090A0B0C0D0E0F
+IV: 101112131415161718191A1B1C1D1E1F
+BlockSize: 16
+BlockPaddingScheme: 0  # NoPadding
+Plaintext: 202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F
+Ciphertext: A73625D7BE994E85469A9FAABCEDAAB6DBC5F65DD77BB35E06BD7D1D8EAFC8624D6CB31CE189C82B8979F2936DE9BF14
+Test: Encrypt
+Name: Kalyna/CBC
+Source: DSTU 7624:2014, Section B.6.3 (p.149)
+Comment: Kalyna 256-bit key, 128-bit block, OneAndZeros padding
+Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
+IV: 202122232425262728292A2B2C2D2E2F
+BlockSize: 16
+BlockPaddingScheme: 3  # OneAndZeroPadding
+Plaintext: 303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D
+Ciphertext: 13EA15843AD14C50BC03ECEF1F43E398E4217752D3EB046AC393DACC5CA1D6FA0EB9FCEB229362B4F1565527EE3D8433
+Test: Encrypt
+Name: Kalyna/CBC
+Source: DSTU 7624:2014, Section B.6.5 (p.151)
+Comment: Kalyna 256-bit key, 256-bit block
+Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F
+IV:  202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F
+BlockSize: 32
+BlockPaddingScheme: 0  # NoPadding
+Plaintext:  404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F \
+            606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F \
+            808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F
+Ciphertext: 9CDFDAA75929E7C2A5CFC1BF16B42C5AE3886D0258E8C577DC01DAF62D185FB9 \
+            99B9867736B87110F5F1BC7481912C593F48FF79E2AFDFAB9F704A277EC3E557 \
+            B1B0A9F223DAE6ED5AF591C4F2D6FB22E48334F5E9B96B1A2EA5200F30A406CE
+Test: Encrypt
+Name: Kalyna/CBC
+Source: DSTU 7624:2014, Section B.6.7 (p.151)
+Comment: Kalyna 512-bit key, 256-bit block
+Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F \
+     202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F
+IV:  404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
+BlockSize: 32
+BlockPaddingScheme: 0  # NoPadding
+Plaintext: 606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F \
+           808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F \
+           A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF
+Ciphertext: B8A2474578C2FEBF3F94703587BD5FDC3F4A4D2F43575B6144A1E1031FB3D145 \
+            2B7FD52F5E3411461DAC506869FF8D2FAEF4FEE60379AE00B33AA3EAF911645A \
+            F8091CD8A45D141D1FB150E5A01C1F26FF3DBD26AC4225EC7577B2CE57A5B0FF
+Test: Encrypt
+Name: Kalyna/CBC
+Source: DSTU 7624:2014, Section B.6.9 (p.152)
+Comment: Kalyna 512-bit key, 512-bit block
+Key: 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F \
+     202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F
+IV:  404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F \
+     606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F
+BlockSize: 64
+BlockPaddingScheme: 0  # NoPadding
+Plaintext: 808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F \
+           A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF \
+           C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF \
+           E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF
+Ciphertext: D4739B829EF901B24C1162AE4FDEF897EDA41FAC7F5770CDC90E1D1CDF124E8D \
+            7831E06B4498A4B6F6EC815DF2461DC99BB0449B0F09FCAA2C84090534BCC932 \
+            9626FD74EF8F0A0BCB5765184629C3CBF53B0FB134F6D0421174B1C4E884D1CD \
+            1069A7AD19752DCEBF655842E79B7858BDE01390A760D85E88925BFE38B0FA57
+Test: Encrypt
\ No newline at end of file