diff --git a/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/bootstrap.mlir b/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/bootstrap.mlir
deleted file mode 100644
index 208df2eef..000000000
--- a/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/bootstrap.mlir
+++ /dev/null
@@ -1,22 +0,0 @@
-// RUN: concretecompiler --passes concrete-to-concrete-c-api --action=dump-std %s 2>&1| FileCheck %s
-
-// CHECK-LABEL: module
-// CHECK: func private @keyswitch_lwe_u64(index, !Concrete.lwe_key_switch_key, !Concrete.lwe_ciphertext<_,_>, !Concrete.lwe_ciphertext<_,_>)
-// CHECK: func private @get_keyswitch_key(!Concrete.context) -> !Concrete.lwe_key_switch_key
-// CHECK: func private @bootstrap_lwe_u64(index, !Concrete.lwe_bootstrap_key, !Concrete.lwe_ciphertext<_,_>, !Concrete.lwe_ciphertext<_,_>, !Concrete.glwe_ciphertext)
-// CHECK: func private @get_bootstrap_key(!Concrete.context) -> !Concrete.lwe_bootstrap_key
-// CHECK: func private @allocate_lwe_ciphertext_u64(index, index) -> !Concrete.lwe_ciphertext<_,_>
-// CHECK-LABEL: func @bootstrap_lwe(%arg0: !Concrete.lwe_ciphertext<1024,4>, %arg1: !Concrete.glwe_ciphertext, %arg2: !Concrete.context) -> !Concrete.lwe_ciphertext<1024,4>
-func @bootstrap_lwe(%arg0: !Concrete.lwe_ciphertext<1024,4>, %arg1: !Concrete.glwe_ciphertext) -> !Concrete.lwe_ciphertext<1024,4> {
-  // CHECK-NEXT: %[[ERR:.*]] = arith.constant 0 : index
-  // CHECK-NEXT: %[[C0:.*]] = arith.constant 1025 : index
-  // CHECK-NEXT: %[[V1:.*]] = call @allocate_lwe_ciphertext_u64(%[[ERR]], %[[C0]]) : (index, index) -> !Concrete.lwe_ciphertext<_,_>
-  // CHECK-NEXT: %[[V2:.*]] = call @get_bootstrap_key(%arg2) : (!Concrete.context) -> !Concrete.lwe_bootstrap_key
-  // CHECK-NEXT: %[[V3:.*]] = builtin.unrealized_conversion_cast %arg0 : !Concrete.lwe_ciphertext<1024,4> to !Concrete.lwe_ciphertext<_,_>
-  // CHECK-NEXT: %[[V4:.*]] = builtin.unrealized_conversion_cast %arg1 : !Concrete.glwe_ciphertext to !Concrete.glwe_ciphertext
-  // CHECK-NEXT: call @bootstrap_lwe_u64(%[[ERR]], %[[V2]], %[[V1]], %[[V3]], %[[V4]]) : (index, !Concrete.lwe_bootstrap_key, !Concrete.lwe_ciphertext<_,_>, !Concrete.lwe_ciphertext<_,_>, !Concrete.glwe_ciphertext) -> ()
-  // CHECK-NEXT: %[[RES:.*]] = builtin.unrealized_conversion_cast %[[V1]] : !Concrete.lwe_ciphertext<_,_> to !Concrete.lwe_ciphertext<1024,4>
-  // CHECK-NEXT: return %[[RES]] : !Concrete.lwe_ciphertext<1024,4>
-  %1 = "Concrete.bootstrap_lwe"(%arg0, %arg1) {baseLog = 2 : i32, glweDimension = 1 : i32, level = 3 : i32, polynomialSize = 1024 : i32} : (!Concrete.lwe_ciphertext<1024,4>, !Concrete.glwe_ciphertext) -> !Concrete.lwe_ciphertext<1024,4>
-  return %1: !Concrete.lwe_ciphertext<1024,4>
-}
diff --git a/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/glwe_from_table.mlir b/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/glwe_from_table.mlir
deleted file mode 100644
index 38d1fcbe4..000000000
--- a/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/glwe_from_table.mlir
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: concretecompiler --passes concrete-to-concrete-c-api --action=dump-std %s 2>&1| FileCheck %s
-
-// CHECK-LABEL: module
-// CHECK: func private @runtime_foreign_plaintext_list_u64(index, tensor<16xi64>, i64, i32) -> !Concrete.foreign_plaintext_list
-// CHECK: func private @add_plaintext_list_glwe_ciphertext_u64(index, !Concrete.glwe_ciphertext, !Concrete.glwe_ciphertext, !Concrete.plaintext_list)
-// CHECK: func private @fill_plaintext_list_with_expansion_u64(index, !Concrete.plaintext_list, !Concrete.foreign_plaintext_list)
-// CHECK: func private @allocate_plaintext_list_u64(index, i32) -> !Concrete.plaintext_list
-// CHECK: func private @allocate_glwe_ciphertext_u64(index, i32, i32) -> !Concrete.glwe_ciphertext
-// CHECK-LABEL: func @glwe_from_table(%arg0: tensor<16xi64>, %arg1: !Concrete.context) -> !Concrete.glwe_ciphertext
-func @glwe_from_table(%arg0: tensor<16xi64>) -> !Concrete.glwe_ciphertext {
-  // CHECK-NEXT: %[[V0:.*]] = arith.constant 0 : index
-  // CHECK-NEXT: %[[C0:.*]] = arith.constant 2 : i32
-  // CHECK-NEXT: %[[C1:.*]] = arith.constant 1024 : i32
-  // CHECK-NEXT: %[[V1:.*]] = call @allocate_glwe_ciphertext_u64(%[[V0]], %[[C0]], %[[C1]]) : (index, i32, i32) -> !Concrete.glwe_ciphertext
-  // CHECK-NEXT: %[[V2:.*]] = call @allocate_glwe_ciphertext_u64(%[[V0]], %[[C0]], %[[C1]]) : (index, i32, i32) -> !Concrete.glwe_ciphertext
-  // CHECK-NEXT: %[[V3:.*]] = call @allocate_plaintext_list_u64(%[[V0]], %[[C1]]) : (index, i32) -> !Concrete.plaintext_list
-  // CHECK-NEXT: %[[C2:.*]] = arith.constant 16 : i64
-  // CHECK-NEXT: %[[C3:.*]] = arith.constant 4 : i32
-  // CHECK-NEXT: %[[V4:.*]] = call @runtime_foreign_plaintext_list_u64(%[[V0]], %arg0, %[[C2]], %[[C3]]) : (index, tensor<16xi64>, i64, i32) -> !Concrete.foreign_plaintext_list
-  // CHECK-NEXT: call @fill_plaintext_list_with_expansion_u64(%[[V0]], %[[V3]], %[[V4]]) : (index, !Concrete.plaintext_list, !Concrete.foreign_plaintext_list) -> ()
-  // CHECK-NEXT: call @add_plaintext_list_glwe_ciphertext_u64(%[[V0]], %[[V1]], %[[V2]], %[[V3]]) : (index, !Concrete.glwe_ciphertext, !Concrete.glwe_ciphertext, !Concrete.plaintext_list) -> ()
-  // CHECK-NEXT: return %[[V1]] : !Concrete.glwe_ciphertext
-  %1 = "Concrete.glwe_from_table"(%arg0) {glweDimension = 1 : i32, p = 4 : i32, polynomialSize = 1024 : i32} : (tensor<16xi64>) -> !Concrete.glwe_ciphertext
-  return %1: !Concrete.glwe_ciphertext
-}
diff --git a/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/keyswitch_lwe.mlir b/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/keyswitch_lwe.mlir
deleted file mode 100644
index cb6cf87fe..000000000
--- a/compiler/tests/Conversion/ConcreteToConcreteCAPI/ConcreteToConcreteCAPI/keyswitch_lwe.mlir
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: concretecompiler --passes concrete-to-concrete-c-api --action=dump-std %s 2>&1| FileCheck %s
-
-// CHECK-LABEL: module
-// CHECK: func private @keyswitch_lwe_u64(index, !Concrete.lwe_key_switch_key, !Concrete.lwe_ciphertext<_,_>, !Concrete.lwe_ciphertext<_,_>)
-// CHECK: func private @get_keyswitch_key(!Concrete.context) -> !Concrete.lwe_key_switch_key
-// CHECK: func private @bootstrap_lwe_u64(index, !Concrete.lwe_bootstrap_key, !Concrete.lwe_ciphertext<_,_>, !Concrete.lwe_ciphertext<_,_>, !Concrete.glwe_ciphertext)
-// CHECK: func private @get_bootstrap_key(!Concrete.context) -> !Concrete.lwe_bootstrap_key
-// CHECK: func private @allocate_lwe_ciphertext_u64(index, index) -> !Concrete.lwe_ciphertext<_,_>
-// CHECK-LABEL: func @keyswitch_lwe(%arg0: !Concrete.lwe_ciphertext<1024,4>, %arg1: !Concrete.context) -> !Concrete.lwe_ciphertext<1024,4>
-func @keyswitch_lwe(%arg0: !Concrete.lwe_ciphertext<1024,4>) -> !Concrete.lwe_ciphertext<1024,4> {
-  // CHECK-NEXT: %[[ERR:.*]] = arith.constant 0 : index
-  // CHECK-NEXT: %[[C0:.*]] = arith.constant 1025 : index
-  // CHECK-NEXT: %[[V1:.*]] = call @allocate_lwe_ciphertext_u64(%[[ERR]], %[[C0]]) : (index, index) -> !Concrete.lwe_ciphertext<_,_>
-  // CHECK-NEXT: %[[V2:.*]] = call @get_keyswitch_key(%arg1) : (!Concrete.context) -> !Concrete.lwe_key_switch_key
-  // CHECK-NEXT: %[[V3:.*]] = builtin.unrealized_conversion_cast %arg0 : !Concrete.lwe_ciphertext<1024,4> to !Concrete.lwe_ciphertext<_,_>
-  // CHECK-NEXT: call @keyswitch_lwe_u64(%[[ERR]], %[[V2]], %[[V1]], %[[V3]]) : (index, !Concrete.lwe_key_switch_key, !Concrete.lwe_ciphertext<_,_>, !Concrete.lwe_ciphertext<_,_>) -> ()
-  // CHECK-NEXT: %[[RES:.*]] = builtin.unrealized_conversion_cast %[[V1]] : !Concrete.lwe_ciphertext<_,_> to !Concrete.lwe_ciphertext<1024,4>
-  // CHECK-NEXT: return %[[RES]] : !Concrete.lwe_ciphertext<1024,4>
-  %1 = "Concrete.keyswitch_lwe"(%arg0) {baseLog = 2 : i32, inputLweSize = 1 : i32, level = 3 : i32, outputLweSize = 1 : i32} : (!Concrete.lwe_ciphertext<1024,4>) -> !Concrete.lwe_ciphertext<1024,4>
-  return %1: !Concrete.lwe_ciphertext<1024,4>
-}