diff --git a/.ignore b/.ignore
new file mode 100644
index 000000000..6a275d68e
--- /dev/null
+++ b/.ignore
@@ -0,0 +1 @@
+!problem-specifications
diff --git a/exercises/practice/collatz-conjecture/.meta/test_template.tera b/exercises/practice/collatz-conjecture/.meta/test_template.tera
index eec8050c3..8a4d405ce 100644
--- a/exercises/practice/collatz-conjecture/.meta/test_template.tera
+++ b/exercises/practice/collatz-conjecture/.meta/test_template.tera
@@ -4,8 +4,7 @@ use collatz_conjecture::*;
 #[test]
 #[ignore]
 fn {{ test.description | snake_case }}() {
-    let output = collatz({{ test.input.number | json_encode() }});
-    
+    let output = collatz({{ test.input.number | fmt_num }});
     let expected = {% if test.expected is object %}
         None
     {% else %}
diff --git a/exercises/practice/collatz-conjecture/tests/collatz-conjecture.rs b/exercises/practice/collatz-conjecture/tests/collatz-conjecture.rs
index 9bbced3ec..8ccceefc2 100644
--- a/exercises/practice/collatz-conjecture/tests/collatz-conjecture.rs
+++ b/exercises/practice/collatz-conjecture/tests/collatz-conjecture.rs
@@ -3,7 +3,6 @@ use collatz_conjecture::*;
 #[test]
 fn zero_steps_for_one() {
     let output = collatz(1);
-
     let expected = Some(0);
     assert_eq!(output, expected);
 }
@@ -12,7 +11,6 @@ fn zero_steps_for_one() {
 #[ignore]
 fn divide_if_even() {
     let output = collatz(16);
-
     let expected = Some(4);
     assert_eq!(output, expected);
 }
@@ -21,7 +19,6 @@ fn divide_if_even() {
 #[ignore]
 fn even_and_odd_steps() {
     let output = collatz(12);
-
     let expected = Some(9);
     assert_eq!(output, expected);
 }
@@ -29,8 +26,7 @@ fn even_and_odd_steps() {
 #[test]
 #[ignore]
 fn large_number_of_even_and_odd_steps() {
-    let output = collatz(1000000);
-
+    let output = collatz(1_000_000);
     let expected = Some(152);
     assert_eq!(output, expected);
 }
@@ -39,7 +35,6 @@ fn large_number_of_even_and_odd_steps() {
 #[ignore]
 fn zero_is_an_error() {
     let output = collatz(0);
-
     let expected = None;
     assert_eq!(output, expected);
 }
diff --git a/exercises/practice/eliuds-eggs/.meta/test_template.tera b/exercises/practice/eliuds-eggs/.meta/test_template.tera
index 318242671..9a2306d5b 100644
--- a/exercises/practice/eliuds-eggs/.meta/test_template.tera
+++ b/exercises/practice/eliuds-eggs/.meta/test_template.tera
@@ -4,7 +4,7 @@ use eliuds_eggs::*;
 #[test]
 #[ignore]
 fn test_{{ test.description | snake_case }}() {
-    let input = {{ test.input.number }};
+    let input = {{ test.input.number | fmt_num }};
     let output = egg_count(input);
     let expected = {{ test.expected | json_encode() }};
     assert_eq!(output, expected);
diff --git a/exercises/practice/eliuds-eggs/tests/eliuds-eggs.rs b/exercises/practice/eliuds-eggs/tests/eliuds-eggs.rs
index 9204d0e77..d34e79d1f 100644
--- a/exercises/practice/eliuds-eggs/tests/eliuds-eggs.rs
+++ b/exercises/practice/eliuds-eggs/tests/eliuds-eggs.rs
@@ -29,7 +29,7 @@ fn test_4_eggs() {
 #[test]
 #[ignore]
 fn test_13_eggs() {
-    let input = 2000000000;
+    let input = 2_000_000_000;
     let output = egg_count(input);
     let expected = 13;
     assert_eq!(output, expected);
diff --git a/exercises/practice/nth-prime/.meta/test_template.tera b/exercises/practice/nth-prime/.meta/test_template.tera
index a4c4b8d26..4f3e44aa2 100644
--- a/exercises/practice/nth-prime/.meta/test_template.tera
+++ b/exercises/practice/nth-prime/.meta/test_template.tera
@@ -4,8 +4,8 @@ use nth_prime::*;
 #[test]
 #[ignore]
 fn {{ test.description | snake_case }}() {
-    let output = nth({{ test.input.number - 1 }});
-    let expected = {{ test.expected | json_encode() }};
+    let output = nth({{ test.input.number - 1 | fmt_num }});
+    let expected = {{ test.expected | fmt_num }};
     assert_eq!(output, expected);
 }
 {% endfor -%}
diff --git a/exercises/practice/nth-prime/tests/nth-prime.rs b/exercises/practice/nth-prime/tests/nth-prime.rs
index 19e6433fc..3a496849a 100644
--- a/exercises/practice/nth-prime/tests/nth-prime.rs
+++ b/exercises/practice/nth-prime/tests/nth-prime.rs
@@ -26,7 +26,7 @@ fn sixth_prime() {
 #[test]
 #[ignore]
 fn big_prime() {
-    let output = nth(10000);
-    let expected = 104743;
+    let output = nth(10_000);
+    let expected = 104_743;
     assert_eq!(output, expected);
 }
diff --git a/exercises/practice/perfect-numbers/.meta/test_template.tera b/exercises/practice/perfect-numbers/.meta/test_template.tera
index 4f3e334b4..8d90392dc 100644
--- a/exercises/practice/perfect-numbers/.meta/test_template.tera
+++ b/exercises/practice/perfect-numbers/.meta/test_template.tera
@@ -5,7 +5,7 @@ use perfect_numbers::*;
 #[test]
 #[ignore]
 fn {{ test.description | snake_case }}() {
-    let input = {{ test.input.number | json_encode() }};
+    let input = {{ test.input.number | fmt_num }};
     let output = classify(input);
 {%- if test.expected is object %}
     assert!(output.is_none());
diff --git a/exercises/practice/perfect-numbers/tests/perfect-numbers.rs b/exercises/practice/perfect-numbers/tests/perfect-numbers.rs
index fd29de0d9..582862278 100644
--- a/exercises/practice/perfect-numbers/tests/perfect-numbers.rs
+++ b/exercises/practice/perfect-numbers/tests/perfect-numbers.rs
@@ -20,7 +20,7 @@ fn medium_perfect_number_is_classified_correctly() {
 #[test]
 #[ignore]
 fn large_perfect_number_is_classified_correctly() {
-    let input = 33550336;
+    let input = 33_550_336;
     let output = classify(input);
     let expected = Some(Classification::Perfect);
     assert_eq!(output, expected);
@@ -47,7 +47,7 @@ fn medium_abundant_number_is_classified_correctly() {
 #[test]
 #[ignore]
 fn large_abundant_number_is_classified_correctly() {
-    let input = 33550335;
+    let input = 33_550_335;
     let output = classify(input);
     let expected = Some(Classification::Abundant);
     assert_eq!(output, expected);
@@ -83,7 +83,7 @@ fn medium_deficient_number_is_classified_correctly() {
 #[test]
 #[ignore]
 fn large_deficient_number_is_classified_correctly() {
-    let input = 33550337;
+    let input = 33_550_337;
     let output = classify(input);
     let expected = Some(Classification::Deficient);
     assert_eq!(output, expected);
diff --git a/exercises/practice/prime-factors/.meta/test_template.tera b/exercises/practice/prime-factors/.meta/test_template.tera
index 9c8604d1e..2a0bbb62b 100644
--- a/exercises/practice/prime-factors/.meta/test_template.tera
+++ b/exercises/practice/prime-factors/.meta/test_template.tera
@@ -4,8 +4,10 @@ use prime_factors::*;
 #[test]
 #[ignore]
 fn {{ test.description | snake_case }}() {
-    let factors = factors({{ test.input.value }});
-    let expected = {{ test.expected | json_encode() }};
+    let factors = factors({{ test.input.value | fmt_num }});
+    let expected = [{% for factor in test.expected -%}
+        {{ factor | fmt_num }},
+    {%- endfor %}];
     assert_eq!(factors, expected);
 }
 {% endfor -%}
diff --git a/exercises/practice/prime-factors/tests/prime-factors.rs b/exercises/practice/prime-factors/tests/prime-factors.rs
index c5b67581c..119c9c8a9 100644
--- a/exercises/practice/prime-factors/tests/prime-factors.rs
+++ b/exercises/practice/prime-factors/tests/prime-factors.rs
@@ -82,7 +82,7 @@ fn product_of_primes_and_non_primes() {
 #[test]
 #[ignore]
 fn product_of_primes() {
-    let factors = factors(901255);
+    let factors = factors(901_255);
     let expected = [5, 17, 23, 461];
     assert_eq!(factors, expected);
 }
@@ -90,7 +90,7 @@ fn product_of_primes() {
 #[test]
 #[ignore]
 fn factors_include_a_large_prime() {
-    let factors = factors(93819012551);
-    let expected = [11, 9539, 894119];
+    let factors = factors(93_819_012_551);
+    let expected = [11, 9_539, 894_119];
     assert_eq!(factors, expected);
 }
diff --git a/exercises/practice/pythagorean-triplet/.meta/test_template.tera b/exercises/practice/pythagorean-triplet/.meta/test_template.tera
index 19fa6ab94..6801d172b 100644
--- a/exercises/practice/pythagorean-triplet/.meta/test_template.tera
+++ b/exercises/practice/pythagorean-triplet/.meta/test_template.tera
@@ -5,9 +5,13 @@ use std::collections::HashSet;
 #[test]
 #[ignore]
 fn {{ test.description | snake_case }}() {
-    let input = {{ test.input.n | json_encode() }};
+    let input = {{ test.input.n | fmt_num }};
     let output = find(input);
-    let expected = {{ test.expected | json_encode() }};
+    let expected = [{% for triple in test.expected -%}
+        [{% for side in triple -%}
+            {{ side | fmt_num }},
+        {%- endfor %}],
+    {%- endfor %}];
     let expected: HashSet<_> = expected.iter().cloned().collect();
     assert_eq!(output, expected);
 }
diff --git a/exercises/practice/pythagorean-triplet/tests/pythagorean-triplet.rs b/exercises/practice/pythagorean-triplet/tests/pythagorean-triplet.rs
index a10322554..9568f9095 100644
--- a/exercises/practice/pythagorean-triplet/tests/pythagorean-triplet.rs
+++ b/exercises/practice/pythagorean-triplet/tests/pythagorean-triplet.rs
@@ -24,7 +24,7 @@ fn triplets_whose_sum_is_108() {
 #[test]
 #[ignore]
 fn triplets_whose_sum_is_1000() {
-    let input = 1000;
+    let input = 1_000;
     let output = find(input);
     let expected = [[200, 375, 425]];
     let expected: HashSet<_> = expected.iter().cloned().collect();
@@ -34,7 +34,7 @@ fn triplets_whose_sum_is_1000() {
 #[test]
 #[ignore]
 fn no_matching_triplets_for_1001() {
-    let input = 1001;
+    let input = 1_001;
     let output = find(input);
     let expected = [];
     let expected: HashSet<_> = expected.iter().cloned().collect();
@@ -73,14 +73,14 @@ fn several_matching_triplets() {
 #[test]
 #[ignore]
 fn triplets_for_large_number() {
-    let input = 30000;
+    let input = 30_000;
     let output = find(input);
     let expected = [
-        [1200, 14375, 14425],
-        [1875, 14000, 14125],
-        [5000, 12000, 13000],
-        [6000, 11250, 12750],
-        [7500, 10000, 12500],
+        [1_200, 14_375, 14_425],
+        [1_875, 14_000, 14_125],
+        [5_000, 12_000, 13_000],
+        [6_000, 11_250, 12_750],
+        [7_500, 10_000, 12_500],
     ];
     let expected: HashSet<_> = expected.iter().cloned().collect();
     assert_eq!(output, expected);
diff --git a/exercises/practice/say/.meta/test_template.tera b/exercises/practice/say/.meta/test_template.tera
index b67fcdf1d..ab79d73cd 100644
--- a/exercises/practice/say/.meta/test_template.tera
+++ b/exercises/practice/say/.meta/test_template.tera
@@ -4,7 +4,7 @@ use say::*;
 #[test]
 #[ignore]
 fn {{ test.description | snake_case }}() {
-    let input = {{ test.input.number | json_encode() }};
+    let input = {{ test.input.number | fmt_num }};
     let output = encode(input);
     let expected = {{ test.expected | json_encode() }};
     assert_eq!(output, expected);
diff --git a/exercises/practice/say/tests/say.rs b/exercises/practice/say/tests/say.rs
index 78cb7a35c..6d902f4fb 100644
--- a/exercises/practice/say/tests/say.rs
+++ b/exercises/practice/say/tests/say.rs
@@ -101,7 +101,7 @@ fn nine_hundred_ninety_nine() {
 #[test]
 #[ignore]
 fn one_thousand() {
-    let input = 1000;
+    let input = 1_000;
     let output = encode(input);
     let expected = "one thousand";
     assert_eq!(output, expected);
@@ -110,7 +110,7 @@ fn one_thousand() {
 #[test]
 #[ignore]
 fn one_thousand_two_hundred_thirty_four() {
-    let input = 1234;
+    let input = 1_234;
     let output = encode(input);
     let expected = "one thousand two hundred thirty-four";
     assert_eq!(output, expected);
@@ -119,7 +119,7 @@ fn one_thousand_two_hundred_thirty_four() {
 #[test]
 #[ignore]
 fn one_million() {
-    let input = 1000000;
+    let input = 1_000_000;
     let output = encode(input);
     let expected = "one million";
     assert_eq!(output, expected);
@@ -128,7 +128,7 @@ fn one_million() {
 #[test]
 #[ignore]
 fn one_million_two_thousand_three_hundred_forty_five() {
-    let input = 1002345;
+    let input = 1_002_345;
     let output = encode(input);
     let expected = "one million two thousand three hundred forty-five";
     assert_eq!(output, expected);
@@ -137,7 +137,7 @@ fn one_million_two_thousand_three_hundred_forty_five() {
 #[test]
 #[ignore]
 fn one_billion() {
-    let input = 1000000000;
+    let input = 1_000_000_000;
     let output = encode(input);
     let expected = "one billion";
     assert_eq!(output, expected);
@@ -146,7 +146,7 @@ fn one_billion() {
 #[test]
 #[ignore]
 fn a_big_number() {
-    let input = 987654321123;
+    let input = 987_654_321_123;
     let output = encode(input);
     let expected = "nine hundred eighty-seven billion six hundred fifty-four million three hundred twenty-one thousand one hundred twenty-three";
     assert_eq!(output, expected);
@@ -155,7 +155,7 @@ fn a_big_number() {
 #[test]
 #[ignore]
 fn max_i64() {
-    let input = 9223372036854775807;
+    let input = 9_223_372_036_854_775_807;
     let output = encode(input);
     let expected = "nine quintillion two hundred twenty-three quadrillion three hundred seventy-two trillion thirty-six billion eight hundred fifty-four million seven hundred seventy-five thousand eight hundred seven";
     assert_eq!(output, expected);
@@ -164,7 +164,7 @@ fn max_i64() {
 #[test]
 #[ignore]
 fn max_u64() {
-    let input = 18446744073709551615;
+    let input = 18_446_744_073_709_551_615;
     let output = encode(input);
     let expected = "eighteen quintillion four hundred forty-six quadrillion seven hundred forty-four trillion seventy-three billion seven hundred nine million five hundred fifty-one thousand six hundred fifteen";
     assert_eq!(output, expected);
diff --git a/exercises/practice/space-age/.meta/test_template.tera b/exercises/practice/space-age/.meta/test_template.tera
index 01d6d1c69..a69f248ef 100644
--- a/exercises/practice/space-age/.meta/test_template.tera
+++ b/exercises/practice/space-age/.meta/test_template.tera
@@ -11,7 +11,7 @@ fn assert_in_delta(expected: f64, actual: f64) {
 #[test]
 #[ignore]
 fn {{ test.description | snake_case }}() {
-    let seconds = {{ test.input.seconds | json_encode() }};
+    let seconds = {{ test.input.seconds | fmt_num }};
     let duration = Duration::from(seconds);
     let output = {{ test.input.planet }}::years_during(&duration);
     let expected = {{ test.expected | json_encode() }};
diff --git a/exercises/practice/space-age/tests/space-age.rs b/exercises/practice/space-age/tests/space-age.rs
index 9f379aff8..995feedb1 100644
--- a/exercises/practice/space-age/tests/space-age.rs
+++ b/exercises/practice/space-age/tests/space-age.rs
@@ -10,7 +10,7 @@ fn assert_in_delta(expected: f64, actual: f64) {
 
 #[test]
 fn age_on_earth() {
-    let seconds = 1000000000;
+    let seconds = 1_000_000_000;
     let duration = Duration::from(seconds);
     let output = Earth::years_during(&duration);
     let expected = 31.69;
@@ -20,7 +20,7 @@ fn age_on_earth() {
 #[test]
 #[ignore]
 fn age_on_mercury() {
-    let seconds = 2134835688;
+    let seconds = 2_134_835_688;
     let duration = Duration::from(seconds);
     let output = Mercury::years_during(&duration);
     let expected = 280.88;
@@ -30,7 +30,7 @@ fn age_on_mercury() {
 #[test]
 #[ignore]
 fn age_on_venus() {
-    let seconds = 189839836;
+    let seconds = 189_839_836;
     let duration = Duration::from(seconds);
     let output = Venus::years_during(&duration);
     let expected = 9.78;
@@ -40,7 +40,7 @@ fn age_on_venus() {
 #[test]
 #[ignore]
 fn age_on_mars() {
-    let seconds = 2129871239;
+    let seconds = 2_129_871_239;
     let duration = Duration::from(seconds);
     let output = Mars::years_during(&duration);
     let expected = 35.88;
@@ -50,7 +50,7 @@ fn age_on_mars() {
 #[test]
 #[ignore]
 fn age_on_jupiter() {
-    let seconds = 901876382;
+    let seconds = 901_876_382;
     let duration = Duration::from(seconds);
     let output = Jupiter::years_during(&duration);
     let expected = 2.41;
@@ -60,7 +60,7 @@ fn age_on_jupiter() {
 #[test]
 #[ignore]
 fn age_on_saturn() {
-    let seconds = 2000000000;
+    let seconds = 2_000_000_000;
     let duration = Duration::from(seconds);
     let output = Saturn::years_during(&duration);
     let expected = 2.15;
@@ -70,7 +70,7 @@ fn age_on_saturn() {
 #[test]
 #[ignore]
 fn age_on_uranus() {
-    let seconds = 1210123456;
+    let seconds = 1_210_123_456;
     let duration = Duration::from(seconds);
     let output = Uranus::years_during(&duration);
     let expected = 0.46;
@@ -80,7 +80,7 @@ fn age_on_uranus() {
 #[test]
 #[ignore]
 fn age_on_neptune() {
-    let seconds = 1821023456;
+    let seconds = 1_821_023_456;
     let duration = Duration::from(seconds);
     let output = Neptune::years_during(&duration);
     let expected = 0.35;
diff --git a/exercises/practice/sum-of-multiples/.meta/test_template.tera b/exercises/practice/sum-of-multiples/.meta/test_template.tera
index bf40be46b..a4f690cbd 100644
--- a/exercises/practice/sum-of-multiples/.meta/test_template.tera
+++ b/exercises/practice/sum-of-multiples/.meta/test_template.tera
@@ -5,9 +5,9 @@ use sum_of_multiples::*;
 #[ignore]
 fn {{ test.description | snake_case }}() {
     let factors = &{{ test.input.factors | json_encode() }};
-    let limit = {{ test.input.limit | json_encode() }};
+    let limit = {{ test.input.limit | fmt_num }};
     let output = sum_of_multiples(limit, factors);
-    let expected = {{ test.expected | json_encode() }};
+    let expected = {{ test.expected | fmt_num }};
     assert_eq!(output, expected);
 }
 {% endfor -%}
diff --git a/exercises/practice/sum-of-multiples/tests/sum-of-multiples.rs b/exercises/practice/sum-of-multiples/tests/sum-of-multiples.rs
index 40c0dbdbb..9864598ce 100644
--- a/exercises/practice/sum-of-multiples/tests/sum-of-multiples.rs
+++ b/exercises/practice/sum-of-multiples/tests/sum-of-multiples.rs
@@ -45,7 +45,7 @@ fn each_multiple_is_only_counted_once() {
     let factors = &[3, 5];
     let limit = 100;
     let output = sum_of_multiples(limit, factors);
-    let expected = 2318;
+    let expected = 2_318;
     assert_eq!(output, expected);
 }
 
@@ -53,9 +53,9 @@ fn each_multiple_is_only_counted_once() {
 #[ignore]
 fn a_much_larger_limit() {
     let factors = &[3, 5];
-    let limit = 1000;
+    let limit = 1_000;
     let output = sum_of_multiples(limit, factors);
-    let expected = 233168;
+    let expected = 233_168;
     assert_eq!(output, expected);
 }
 
@@ -85,7 +85,7 @@ fn some_pairs_of_factors_relatively_prime_and_some_not() {
     let factors = &[5, 6, 8];
     let limit = 150;
     let output = sum_of_multiples(limit, factors);
-    let expected = 4419;
+    let expected = 4_419;
     assert_eq!(output, expected);
 }
 
@@ -103,9 +103,9 @@ fn one_factor_is_a_multiple_of_another() {
 #[ignore]
 fn much_larger_factors() {
     let factors = &[43, 47];
-    let limit = 10000;
+    let limit = 10_000;
     let output = sum_of_multiples(limit, factors);
-    let expected = 2203160;
+    let expected = 2_203_160;
     assert_eq!(output, expected);
 }
 
@@ -115,7 +115,7 @@ fn all_numbers_are_multiples_of_1() {
     let factors = &[1];
     let limit = 100;
     let output = sum_of_multiples(limit, factors);
-    let expected = 4950;
+    let expected = 4_950;
     assert_eq!(output, expected);
 }
 
@@ -123,7 +123,7 @@ fn all_numbers_are_multiples_of_1() {
 #[ignore]
 fn no_factors_means_an_empty_sum() {
     let factors = &[];
-    let limit = 10000;
+    let limit = 10_000;
     let output = sum_of_multiples(limit, factors);
     let expected = 0;
     assert_eq!(output, expected);
@@ -153,8 +153,8 @@ fn the_factor_0_does_not_affect_the_sum_of_multiples_of_other_factors() {
 #[ignore]
 fn solutions_using_include_exclude_must_extend_to_cardinality_greater_than_3() {
     let factors = &[2, 3, 5, 7, 11];
-    let limit = 10000;
+    let limit = 10_000;
     let output = sum_of_multiples(limit, factors);
-    let expected = 39614537;
+    let expected = 39_614_537;
     assert_eq!(output, expected);
 }
diff --git a/exercises/practice/variable-length-quantity/.meta/test_template.tera b/exercises/practice/variable-length-quantity/.meta/test_template.tera
index b8c8c450a..f09cf6504 100644
--- a/exercises/practice/variable-length-quantity/.meta/test_template.tera
+++ b/exercises/practice/variable-length-quantity/.meta/test_template.tera
@@ -6,7 +6,9 @@ use variable_length_quantity as vlq;
 #[ignore]
 fn {{ test.description | snake_case }}() {
 {%- if test.property == "encode" %}
-    let input = &{{ test.input.integers | json_encode() }};
+    let input = &[{% for integer in test.input.integers -%}
+        {{ integer | fmt_num }},
+    {%- endfor %}];
     let output = vlq::to_bytes(input);
     let expected = vec![
         {%- for byte in test.expected -%}
@@ -23,7 +25,9 @@ fn {{ test.description | snake_case }}() {
     let expected = {% if test.expected is object -%}
         Err(vlq::Error::IncompleteNumber)
     {%- else -%}
-        Ok(vec!{{ test.expected | json_encode() }})
+        Ok(vec![{% for integer in test.expected -%}
+            {{ integer | fmt_num }},
+        {%- endfor %}])
     {%- endif %};
 {%- else %}
     panic!("unknown property: {{ test.property }}");
diff --git a/exercises/practice/variable-length-quantity/tests/variable-length-quantity.rs b/exercises/practice/variable-length-quantity/tests/variable-length-quantity.rs
index 68079b12c..e3f3dfe5f 100644
--- a/exercises/practice/variable-length-quantity/tests/variable-length-quantity.rs
+++ b/exercises/practice/variable-length-quantity/tests/variable-length-quantity.rs
@@ -38,7 +38,7 @@ fn smallest_double_byte() {
 #[test]
 #[ignore]
 fn arbitrary_double_byte() {
-    let input = &[8192];
+    let input = &[8_192];
     let output = vlq::to_bytes(input);
     let expected = vec![0xc0, 0x0];
     assert_eq!(output, expected);
@@ -47,7 +47,7 @@ fn arbitrary_double_byte() {
 #[test]
 #[ignore]
 fn largest_double_byte() {
-    let input = &[16383];
+    let input = &[16_383];
     let output = vlq::to_bytes(input);
     let expected = vec![0xff, 0x7f];
     assert_eq!(output, expected);
@@ -56,7 +56,7 @@ fn largest_double_byte() {
 #[test]
 #[ignore]
 fn smallest_triple_byte() {
-    let input = &[16384];
+    let input = &[16_384];
     let output = vlq::to_bytes(input);
     let expected = vec![0x81, 0x80, 0x0];
     assert_eq!(output, expected);
@@ -65,7 +65,7 @@ fn smallest_triple_byte() {
 #[test]
 #[ignore]
 fn arbitrary_triple_byte() {
-    let input = &[1048576];
+    let input = &[1_048_576];
     let output = vlq::to_bytes(input);
     let expected = vec![0xc0, 0x80, 0x0];
     assert_eq!(output, expected);
@@ -74,7 +74,7 @@ fn arbitrary_triple_byte() {
 #[test]
 #[ignore]
 fn largest_triple_byte() {
-    let input = &[2097151];
+    let input = &[2_097_151];
     let output = vlq::to_bytes(input);
     let expected = vec![0xff, 0xff, 0x7f];
     assert_eq!(output, expected);
@@ -83,7 +83,7 @@ fn largest_triple_byte() {
 #[test]
 #[ignore]
 fn smallest_quadruple_byte() {
-    let input = &[2097152];
+    let input = &[2_097_152];
     let output = vlq::to_bytes(input);
     let expected = vec![0x81, 0x80, 0x80, 0x0];
     assert_eq!(output, expected);
@@ -92,7 +92,7 @@ fn smallest_quadruple_byte() {
 #[test]
 #[ignore]
 fn arbitrary_quadruple_byte() {
-    let input = &[134217728];
+    let input = &[134_217_728];
     let output = vlq::to_bytes(input);
     let expected = vec![0xc0, 0x80, 0x80, 0x0];
     assert_eq!(output, expected);
@@ -101,7 +101,7 @@ fn arbitrary_quadruple_byte() {
 #[test]
 #[ignore]
 fn largest_quadruple_byte() {
-    let input = &[268435455];
+    let input = &[268_435_455];
     let output = vlq::to_bytes(input);
     let expected = vec![0xff, 0xff, 0xff, 0x7f];
     assert_eq!(output, expected);
@@ -110,7 +110,7 @@ fn largest_quadruple_byte() {
 #[test]
 #[ignore]
 fn smallest_quintuple_byte() {
-    let input = &[268435456];
+    let input = &[268_435_456];
     let output = vlq::to_bytes(input);
     let expected = vec![0x81, 0x80, 0x80, 0x80, 0x0];
     assert_eq!(output, expected);
@@ -119,7 +119,7 @@ fn smallest_quintuple_byte() {
 #[test]
 #[ignore]
 fn arbitrary_quintuple_byte() {
-    let input = &[4278190080];
+    let input = &[4_278_190_080];
     let output = vlq::to_bytes(input);
     let expected = vec![0x8f, 0xf8, 0x80, 0x80, 0x0];
     assert_eq!(output, expected);
@@ -128,7 +128,7 @@ fn arbitrary_quintuple_byte() {
 #[test]
 #[ignore]
 fn maximum_32_bit_integer_input() {
-    let input = &[4294967295];
+    let input = &[4_294_967_295];
     let output = vlq::to_bytes(input);
     let expected = vec![0x8f, 0xff, 0xff, 0xff, 0x7f];
     assert_eq!(output, expected);
@@ -146,7 +146,7 @@ fn two_single_byte_values() {
 #[test]
 #[ignore]
 fn two_multi_byte_values() {
-    let input = &[16384, 1193046];
+    let input = &[16_384, 1_193_046];
     let output = vlq::to_bytes(input);
     let expected = vec![0x81, 0x80, 0x0, 0xc8, 0xe8, 0x56];
     assert_eq!(output, expected);
@@ -155,7 +155,7 @@ fn two_multi_byte_values() {
 #[test]
 #[ignore]
 fn many_multi_byte_values() {
-    let input = &[8192, 1193046, 268435455, 0, 16383, 16384];
+    let input = &[8_192, 1_193_046, 268_435_455, 0, 16_383, 16_384];
     let output = vlq::to_bytes(input);
     let expected = vec![
         0xc0, 0x0, 0xc8, 0xe8, 0x56, 0xff, 0xff, 0xff, 0x7f, 0x0, 0xff, 0x7f, 0x81, 0x80, 0x0,
@@ -177,7 +177,7 @@ fn one_byte() {
 fn two_bytes() {
     let input = &[0xc0, 0x0];
     let output = vlq::from_bytes(input);
-    let expected = Ok(vec![8192]);
+    let expected = Ok(vec![8_192]);
     assert_eq!(output, expected);
 }
 
@@ -186,7 +186,7 @@ fn two_bytes() {
 fn three_bytes() {
     let input = &[0xff, 0xff, 0x7f];
     let output = vlq::from_bytes(input);
-    let expected = Ok(vec![2097151]);
+    let expected = Ok(vec![2_097_151]);
     assert_eq!(output, expected);
 }
 
@@ -195,7 +195,7 @@ fn three_bytes() {
 fn four_bytes() {
     let input = &[0x81, 0x80, 0x80, 0x0];
     let output = vlq::from_bytes(input);
-    let expected = Ok(vec![2097152]);
+    let expected = Ok(vec![2_097_152]);
     assert_eq!(output, expected);
 }
 
@@ -204,7 +204,7 @@ fn four_bytes() {
 fn maximum_32_bit_integer() {
     let input = &[0x8f, 0xff, 0xff, 0xff, 0x7f];
     let output = vlq::from_bytes(input);
-    let expected = Ok(vec![4294967295]);
+    let expected = Ok(vec![4_294_967_295]);
     assert_eq!(output, expected);
 }
 
@@ -233,6 +233,6 @@ fn multiple_values() {
         0xc0, 0x0, 0xc8, 0xe8, 0x56, 0xff, 0xff, 0xff, 0x7f, 0x0, 0xff, 0x7f, 0x81, 0x80, 0x0,
     ];
     let output = vlq::from_bytes(input);
-    let expected = Ok(vec![8192, 1193046, 268435455, 0, 16383, 16384]);
+    let expected = Ok(vec![8_192, 1_193_046, 268_435_455, 0, 16_383, 16_384]);
     assert_eq!(output, expected);
 }