Unify into a single implementation file

TestAsconAEAD128.cry

@@ -1,11 +1,14 @@
 module TestAsconAEAD128 where
 
 import Ascon
-import AsconCipher
 
 testcase : {n, m} (fin m, fin n) => [128] -> [128] -> [8 * m] -> [8 * n] -> [8 * (m + 16)] -> Bit
 testcase K N P A C =
-    Ascon_AEAD128_bytes (split K) (split N) (split A) (split P) == split C
+    AEAD128_encrypt_bytes (split K) (split N) (split A) (split P) == split C
+    /\
+    case AEAD128_decrypt_bytes (split K) (split N) (split A) (split C) of
+      None -> False
+      Some p -> p == split P
 
 property
   test1 = testcase 0x000102030405060708090A0B0C0D0E0F 0x101112131415161718191A1B1C1D1E1F [] 0x 0x4F9C278211BEC9316BF68F46EE8B2EC6