diff --git a/Cargo.lock b/Cargo.lock
index cc730ede97..f1264d6c01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,30 +74,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.53.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5"
-dependencies = [
- "bitflags",
- "cexpr",
- "cfg-if",
- "clang-sys",
- "clap",
- "env_logger",
- "lazy_static",
- "lazycell",
- "log",
- "peeking_take_while",
- "proc-macro2 1.0.18",
- "quote 1.0.7",
- "regex",
- "rustc-hash",
- "shlex",
- "which",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -161,24 +137,6 @@ version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
-[[package]]
-name = "cc"
-version = "1.0.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cexpr"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -431,12 +389,6 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
 
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
 [[package]]
 name = "hermit-abi"
 version = "0.1.14"
@@ -485,15 +437,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 
-[[package]]
-name = "jobserver"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "jsonrpc-core"
 version = "14.2.0"
@@ -655,16 +598,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0"
 
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "memchr",
- "version_check",
-]
-
 [[package]]
 name = "num_cpus"
 version = "1.13.0"
@@ -687,31 +620,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
-[[package]]
-name = "openssl-probe"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "pest"
 version = "2.1.3"
@@ -1243,12 +1151,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
-[[package]]
-name = "vcpkg"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
-
 [[package]]
 name = "vec_map"
 version = "0.8.2"
diff --git a/compiler/tests/boolean/false_&&_false.leo b/compiler/tests/boolean/false_and_false.leo
similarity index 100%
rename from compiler/tests/boolean/false_&&_false.leo
rename to compiler/tests/boolean/false_and_false.leo
diff --git a/compiler/tests/boolean/false_||_false.leo b/compiler/tests/boolean/false_or_false.leo
similarity index 100%
rename from compiler/tests/boolean/false_||_false.leo
rename to compiler/tests/boolean/false_or_false.leo
diff --git a/compiler/tests/boolean/mod.rs b/compiler/tests/boolean/mod.rs
index 01b428e755..c08922b168 100644
--- a/compiler/tests/boolean/mod.rs
+++ b/compiler/tests/boolean/mod.rs
@@ -121,7 +121,7 @@ fn test_not_u32() {
 
 #[test]
 fn test_true_or_true() {
-    let bytes = include_bytes!("true_||_true.leo");
+    let bytes = include_bytes!("true_or_true.leo");
     let program = parse_program(bytes).unwrap();
 
     output_true(program);
@@ -129,7 +129,7 @@ fn test_true_or_true() {
 
 #[test]
 fn test_true_or_false() {
-    let bytes = include_bytes!("true_||_false.leo");
+    let bytes = include_bytes!("true_or_false.leo");
     let program = parse_program(bytes).unwrap();
 
     output_true(program);
@@ -137,7 +137,7 @@ fn test_true_or_false() {
 
 #[test]
 fn test_false_or_false() {
-    let bytes = include_bytes!("false_||_false.leo");
+    let bytes = include_bytes!("false_or_false.leo");
     let program = parse_program(bytes).unwrap();
 
     output_false(program);
@@ -145,7 +145,7 @@ fn test_false_or_false() {
 
 #[test]
 fn test_true_or_u32() {
-    let bytes = include_bytes!("true_||_u32.leo");
+    let bytes = include_bytes!("true_or_u32.leo");
     let program = parse_program(bytes).unwrap();
 
     fail_enforce(program);
@@ -155,7 +155,7 @@ fn test_true_or_u32() {
 
 #[test]
 fn test_true_and_true() {
-    let bytes = include_bytes!("true_&&_true.leo");
+    let bytes = include_bytes!("true_and_true.leo");
     let program = parse_program(bytes).unwrap();
 
     output_true(program);
@@ -163,7 +163,7 @@ fn test_true_and_true() {
 
 #[test]
 fn test_true_and_false() {
-    let bytes = include_bytes!("true_&&_false.leo");
+    let bytes = include_bytes!("true_and_false.leo");
     let program = parse_program(bytes).unwrap();
 
     output_false(program);
@@ -171,7 +171,7 @@ fn test_true_and_false() {
 
 #[test]
 fn test_false_and_false() {
-    let bytes = include_bytes!("false_&&_false.leo");
+    let bytes = include_bytes!("false_and_false.leo");
     let program = parse_program(bytes).unwrap();
 
     output_false(program);
@@ -179,7 +179,7 @@ fn test_false_and_false() {
 
 #[test]
 fn test_true_and_u32() {
-    let bytes = include_bytes!("true_&&_u32.leo");
+    let bytes = include_bytes!("true_and_u32.leo");
     let program = parse_program(bytes).unwrap();
 
     fail_enforce(program);
diff --git a/compiler/tests/boolean/true_&&_false.leo b/compiler/tests/boolean/true_and_false.leo
similarity index 100%
rename from compiler/tests/boolean/true_&&_false.leo
rename to compiler/tests/boolean/true_and_false.leo
diff --git a/compiler/tests/boolean/true_&&_true.leo b/compiler/tests/boolean/true_and_true.leo
similarity index 100%
rename from compiler/tests/boolean/true_&&_true.leo
rename to compiler/tests/boolean/true_and_true.leo
diff --git a/compiler/tests/boolean/true_&&_u32.leo b/compiler/tests/boolean/true_and_u32.leo
similarity index 100%
rename from compiler/tests/boolean/true_&&_u32.leo
rename to compiler/tests/boolean/true_and_u32.leo
diff --git a/compiler/tests/boolean/true_||_false.leo b/compiler/tests/boolean/true_or_false.leo
similarity index 100%
rename from compiler/tests/boolean/true_||_false.leo
rename to compiler/tests/boolean/true_or_false.leo
diff --git a/compiler/tests/boolean/true_||_true.leo b/compiler/tests/boolean/true_or_true.leo
similarity index 100%
rename from compiler/tests/boolean/true_||_true.leo
rename to compiler/tests/boolean/true_or_true.leo
diff --git a/compiler/tests/boolean/true_||_u32.leo b/compiler/tests/boolean/true_or_u32.leo
similarity index 100%
rename from compiler/tests/boolean/true_||_u32.leo
rename to compiler/tests/boolean/true_or_u32.leo