diff --git a/compiler/src/value/integer/integer.rs b/compiler/src/value/integer/integer.rs
index 7d7bc32c22..40b1a6634b 100644
--- a/compiler/src/value/integer/integer.rs
+++ b/compiler/src/value/integer/integer.rs
@@ -60,7 +60,7 @@ impl fmt::Display for Integer {
         let integer = self;
         let option = match_integer!(integer => integer.get_value());
         match option {
-            Some(number) => write!(f, "{}{}", number, self.get_type()),
+            Some(number) => write!(f, "{}", number),
             None => write!(f, "[input]{}", self.get_type()),
         }
     }
diff --git a/compiler/src/value/value.rs b/compiler/src/value/value.rs
index 57e4df3f89..ae96a7a7dd 100644
--- a/compiler/src/value/value.rs
+++ b/compiler/src/value/value.rs
@@ -334,9 +334,9 @@ impl<F: Field + PrimeField, G: GroupType<F>> fmt::Display for ConstrainedValue<F
                 write!(f, "function {{ {}() }}", function.identifier)
             }
             ConstrainedValue::Import(_, ref value) => write!(f, "{}", value),
-            ConstrainedValue::Mutable(ref value) => write!(f, "mut {}", value),
-            ConstrainedValue::Static(ref value) => write!(f, "static {}", value),
-            ConstrainedValue::Unresolved(ref value) => write!(f, "unresolved {}", value),
+            ConstrainedValue::Mutable(ref value) => write!(f, "{}", value),
+            ConstrainedValue::Static(ref value) => write!(f, "{}", value),
+            ConstrainedValue::Unresolved(ref value) => write!(f, "{}", value),
         }
     }
 }
diff --git a/compiler/tests/array/output/registers_ones.out b/compiler/tests/array/output/registers_ones.out
index d7aaafed88..c6a97c7fd7 100644
--- a/compiler/tests/array/output/registers_ones.out
+++ b/compiler/tests/array/output/registers_ones.out
@@ -1,2 +1,2 @@
 [registers]
-r: [u8; (3)] = [1u8, 1u8, 1u8];
+r: [u8; (3)] = [1, 1, 1];
diff --git a/compiler/tests/array/output/registers_zeros.out b/compiler/tests/array/output/registers_zeros.out
index d6278e3b69..e8c21bb46a 100644
--- a/compiler/tests/array/output/registers_zeros.out
+++ b/compiler/tests/array/output/registers_zeros.out
@@ -1,2 +1,2 @@
 [registers]
-r: [u8; (3)] = [0u8, 0u8, 0u8];
+r: [u8; (3)] = [0, 0, 0];
diff --git a/compiler/tests/function/output/newlines.out b/compiler/tests/function/output/newlines.out
index e6563e6a1b..197a64cc63 100644
--- a/compiler/tests/function/output/newlines.out
+++ b/compiler/tests/function/output/newlines.out
@@ -1,3 +1,3 @@
 [registers]
-a: u32 = 0u32;
-b: u32 = 0u32;
+a: u32 = 0;
+b: u32 = 0;
diff --git a/compiler/tests/statements/conditional/mod.rs b/compiler/tests/statements/conditional/mod.rs
index 532dbbff7d..9b6ae2fe2b 100644
--- a/compiler/tests/statements/conditional/mod.rs
+++ b/compiler/tests/statements/conditional/mod.rs
@@ -190,14 +190,14 @@ fn test_nested() {
 }
 
 fn output_one(program: EdwardsTestCompiler) {
-    let expected = include_bytes!("output_/registers_one.out");
+    let expected = include_bytes!("output/registers_one.out");
     let actual = get_output(program);
 
     assert_eq!(expected, actual.bytes().as_slice());
 }
 
 fn output_zero(program: EdwardsTestCompiler) {
-    let expected = include_bytes!("output_/registers_zero.out");
+    let expected = include_bytes!("output/registers_zero.out");
     let actual = get_output(program);
 
     assert_eq!(expected, actual.bytes().as_slice());
diff --git a/compiler/tests/statements/conditional/output/registers_one.out b/compiler/tests/statements/conditional/output/registers_one.out
new file mode 100644
index 0000000000..be39f343fa
--- /dev/null
+++ b/compiler/tests/statements/conditional/output/registers_one.out
@@ -0,0 +1,2 @@
+[registers]
+a: u32 = 1;
diff --git a/compiler/tests/statements/conditional/output/registers_zero.out b/compiler/tests/statements/conditional/output/registers_zero.out
new file mode 100644
index 0000000000..ae20e35199
--- /dev/null
+++ b/compiler/tests/statements/conditional/output/registers_zero.out
@@ -0,0 +1,2 @@
+[registers]
+a: u32 = 0;
diff --git a/compiler/tests/statements/conditional/output_/registers_one.out b/compiler/tests/statements/conditional/output_/registers_one.out
deleted file mode 100644
index 663014ef39..0000000000
--- a/compiler/tests/statements/conditional/output_/registers_one.out
+++ /dev/null
@@ -1,2 +0,0 @@
-[registers]
-a: u32 = 1u32;
diff --git a/compiler/tests/statements/conditional/output_/registers_zero.out b/compiler/tests/statements/conditional/output_/registers_zero.out
deleted file mode 100644
index fb12d4d334..0000000000
--- a/compiler/tests/statements/conditional/output_/registers_zero.out
+++ /dev/null
@@ -1,2 +0,0 @@
-[registers]
-a: u32 = 0u32;