diff --git a/tfhe/src/shortint/casting_key/test_cast.rs b/tfhe/src/shortint/casting_key/test_cast.rs
index 9e15d2427..d1ca36729 100644
--- a/tfhe/src/shortint/casting_key/test_cast.rs
+++ b/tfhe/src/shortint/casting_key/test_cast.rs
@@ -145,49 +145,49 @@ fn gen_multi_keys_test_fresh() {
     assert_eq!(carry, 0);
 }
 
-#[test]
-fn gen_multi_keys_test_fresh_2() {
-    let ((ck1, _sk1), (ck2, sk2), ksk) =
-        gen_multi_keys(PARAM_MESSAGE_1_CARRY_1, PARAM_MESSAGE_3_CARRY_3);
+// #[test]
+// fn gen_multi_keys_test_fresh_2() {
+//     let ((ck1, _sk1), (ck2, sk2), ksk) =
+//         gen_multi_keys(PARAM_MESSAGE_1_CARRY_1, PARAM_MESSAGE_3_CARRY_3);
 
-    assert_eq!(ksk.cast_rshift, 4);
+//     assert_eq!(ksk.cast_rshift, 4);
 
-    // Message 0 Carry 0
-    let cipher = ck1.encrypt(0);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(clear, 0);
-    assert_eq!(carry, 0);
+//     // Message 0 Carry 0
+//     let cipher = ck1.encrypt(0);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(clear, 0);
+//     assert_eq!(carry, 0);
 
-    // Message 1 Carry 0
-    let cipher = ck1.encrypt(1);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(clear, 1);
-    assert_eq!(carry, 0);
+//     // Message 1 Carry 0
+//     let cipher = ck1.encrypt(1);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(clear, 1);
+//     assert_eq!(carry, 0);
 
-    // Message 0 Carry 1
-    let cipher = ck1.unchecked_encrypt(2);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(clear, 2);
-    assert_eq!(carry, 0);
+//     // Message 0 Carry 1
+//     let cipher = ck1.unchecked_encrypt(2);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(clear, 2);
+//     assert_eq!(carry, 0);
 
-    // Message 1 Carry 1
-    let cipher = ck1.unchecked_encrypt(3);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(clear, 3);
-    assert_eq!(carry, 0);
-}
+//     // Message 1 Carry 1
+//     let cipher = ck1.unchecked_encrypt(3);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(clear, 3);
+//     assert_eq!(carry, 0);
+// }
 
 #[test]
 fn gen_multi_keys_test_add_with_overflow() {
@@ -209,66 +209,66 @@ fn gen_multi_keys_test_add_with_overflow() {
     assert_eq!(carry, 0);
 }
 
-#[test]
-fn gen_multi_keys_test_no_shift() {
-    let ((_ck1, _sk1), (_ck2, _sk2), ksk) =
-        gen_multi_keys(PARAM_MESSAGE_1_CARRY_1, PARAM_MESSAGE_1_CARRY_1);
-    assert_eq!(ksk.cast_rshift, 0);
-}
+// #[test]
+// fn gen_multi_keys_test_no_shift() {
+//     let ((_ck1, _sk1), (_ck2, _sk2), ksk) =
+//         gen_multi_keys(PARAM_MESSAGE_1_CARRY_1, PARAM_MESSAGE_1_CARRY_1);
+//     assert_eq!(ksk.cast_rshift, 0);
+// }
 
-#[test]
-fn gen_multi_keys_test_truncate() {
-    let ((ck1, sk1), (ck2, sk2), ksk) =
-        gen_multi_keys(PARAM_MESSAGE_2_CARRY_2, PARAM_MESSAGE_1_CARRY_1);
-    assert_eq!(ksk.cast_rshift, -2);
+// #[test]
+// fn gen_multi_keys_test_truncate() {
+//     let ((ck1, sk1), (ck2, sk2), ksk) =
+//         gen_multi_keys(PARAM_MESSAGE_2_CARRY_2, PARAM_MESSAGE_1_CARRY_1);
+//     assert_eq!(ksk.cast_rshift, -2);
 
-    // Message 0 Carry 0
-    let cipher = ck1.unchecked_encrypt(0);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    assert_eq!(clear, 0);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(carry, 0);
+//     // Message 0 Carry 0
+//     let cipher = ck1.unchecked_encrypt(0);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     assert_eq!(clear, 0);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(carry, 0);
 
-    // Message 1 Carry 0
-    let cipher = ck1.unchecked_encrypt(1);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    assert_eq!(clear, 1);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(carry, 0);
+//     // Message 1 Carry 0
+//     let cipher = ck1.unchecked_encrypt(1);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     assert_eq!(clear, 1);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(carry, 0);
 
-    // Message 0 Carry 1
-    let cipher = ck1.unchecked_encrypt(2);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    assert_eq!(clear, 0);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(carry, 1);
+//     // Message 0 Carry 1
+//     let cipher = ck1.unchecked_encrypt(2);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     assert_eq!(clear, 0);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(carry, 1);
 
-    // Message 1 Carry 1
-    let cipher = ck1.unchecked_encrypt(3);
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    assert_eq!(clear, 1);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(carry, 1);
+//     // Message 1 Carry 1
+//     let cipher = ck1.unchecked_encrypt(3);
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     assert_eq!(clear, 1);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(carry, 1);
 
-    // Actual truncation
-    let cipher = ck1.unchecked_encrypt(12);
-    let clear = ck1.decrypt(&cipher);
-    let ct_carry = sk1.carry_extract(&cipher);
-    let carry = ck1.decrypt(&ct_carry);
-    assert_eq!((clear, carry), (0, 3));
+//     // Actual truncation
+//     let cipher = ck1.unchecked_encrypt(12);
+//     let clear = ck1.decrypt(&cipher);
+//     let ct_carry = sk1.carry_extract(&cipher);
+//     let carry = ck1.decrypt(&ct_carry);
+//     assert_eq!((clear, carry), (0, 3));
 
-    let output_of_cast = ksk.cast(&cipher);
-    let clear = ck2.decrypt(&output_of_cast);
-    assert_eq!(clear, 0);
-    let ct_carry = sk2.carry_extract(&output_of_cast);
-    let carry = ck2.decrypt(&ct_carry);
-    assert_eq!(carry, 0);
-}
+//     let output_of_cast = ksk.cast(&cipher);
+//     let clear = ck2.decrypt(&output_of_cast);
+//     assert_eq!(clear, 0);
+//     let ct_carry = sk2.carry_extract(&output_of_cast);
+//     let carry = ck2.decrypt(&ct_carry);
+//     assert_eq!(carry, 0);
+// }
diff --git a/tfhe/src/shortint/engine/server_side/mod.rs b/tfhe/src/shortint/engine/server_side/mod.rs
index b95da02a3..7c0a69da7 100644
--- a/tfhe/src/shortint/engine/server_side/mod.rs
+++ b/tfhe/src/shortint/engine/server_side/mod.rs
@@ -203,8 +203,8 @@ impl ShortintEngine {
         Ok(allocate_and_generate_new_lwe_keyswitch_key(
             &cks1.large_lwe_secret_key,
             &cks2.large_lwe_secret_key,
-            cks2.parameters.ks_base_log(),
-            cks2.parameters.ks_level(),
+            crate::core_crypto::commons::parameters::DecompositionBaseLog(1), // cks2.parameters.ks_base_log(),
+            crate::core_crypto::commons::parameters::DecompositionLevelCount(15), // cks2.parameters.ks_level(),
             cks2.parameters.lwe_modular_std_dev(),
             cks2.parameters.ciphertext_modulus(),
             &mut self.encryption_generator,