diff --git a/exercises/acronym/example.tt b/exercises/acronym/example.tt
index 69cc770a31..74f2aca885 100644
--- a/exercises/acronym/example.tt
+++ b/exercises/acronym/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'acronym'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class AcronymTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %>
@@ -14,6 +13,6 @@ class AcronymTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/all-your-base/example.tt b/exercises/all-your-base/example.tt
index 064b38a372..82b3561bea 100644
--- a/exercises/all-your-base/example.tt
+++ b/exercises/all-your-base/example.tt
@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'all_your_base'
 
-# Test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class AllYourBaseTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -12,6 +12,6 @@ class AllYourBaseTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/alphametics/example.tt b/exercises/alphametics/example.tt
index 48cf2eabf7..ae98127ea3 100644
--- a/exercises/alphametics/example.tt
+++ b/exercises/alphametics/example.tt
@@ -3,7 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'alphametics'
 
-# Test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class AlphameticsTest < Minitest::Test
 <% test_cases.each do |test_case| %>
 
@@ -17,6 +17,6 @@ class AlphameticsTest < Minitest::Test
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/anagram/example.tt b/exercises/anagram/example.tt
index 26b66ba78c..54dec42a7b 100644
--- a/exercises/anagram/example.tt
+++ b/exercises/anagram/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'anagram'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class AnagramTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -14,6 +13,6 @@ class AnagramTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/binary/example.tt b/exercises/binary/example.tt
index 4cab53b528..a057b78305 100644
--- a/exercises/binary/example.tt
+++ b/exercises/binary/example.tt
@@ -4,8 +4,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'binary'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class BinaryTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skipped %>
@@ -15,6 +14,6 @@ class BinaryTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/bowling/example.tt b/exercises/bowling/example.tt
index f034b6f991..2cd1fc2b82 100644
--- a/exercises/bowling/example.tt
+++ b/exercises/bowling/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'bowling'
 
-# Test data version: <%= sha1 %>
-#
+# Common test data version: <%= abbreviated_commit_hash %>
 class BowlingTest < Minitest::Test
   def setup
     @game = Game.new
@@ -24,6 +23,6 @@ class BowlingTest < Minitest::Test
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/bracket-push/example.tt b/exercises/bracket-push/example.tt
index f70ffa6281..f6c41d329c 100644
--- a/exercises/bracket-push/example.tt
+++ b/exercises/bracket-push/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'bracket_push'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class BracketsTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skipped %>
@@ -14,6 +13,6 @@ class BracketsTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/clock/example.tt b/exercises/clock/example.tt
index ad39bc071e..c52ce99610 100644
--- a/exercises/clock/example.tt
+++ b/exercises/clock/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'clock'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class ClockTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skipped %>
@@ -14,6 +13,6 @@ class ClockTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/connect/example.tt b/exercises/connect/example.tt
index f8ba5db495..be21a744e5 100644
--- a/exercises/connect/example.tt
+++ b/exercises/connect/example.tt
@@ -3,7 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'connect'
 
-# Test data version commit id: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class ConnectTest < Minitest::Test<% test_cases.each do |test_case| %>
   <%= test_case.ignore_method_length%>def <%= test_case.name %>
     <%= test_case.skipped %><% test_case.test_body.each do |line| %>
diff --git a/exercises/custom-set/example.tt b/exercises/custom-set/example.tt
index 2c2e3e6065..8e43614e32 100644
--- a/exercises/custom-set/example.tt
+++ b/exercises/custom-set/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'custom_set'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class CustomSetTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skipped %>
@@ -14,6 +13,6 @@ class CustomSetTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/difference-of-squares/example.tt b/exercises/difference-of-squares/example.tt
index 9f7e2e834b..62e691df38 100644
--- a/exercises/difference-of-squares/example.tt
+++ b/exercises/difference-of-squares/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'difference_of_squares'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class DifferenceOfSquaresTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %><% if test_case.skipped? %>
     skip<% end %>
@@ -19,6 +18,6 @@ class DifferenceOfSquaresTest < Minitest::Test<% test_cases.each do |test_case|
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/dominoes/example.tt b/exercises/dominoes/example.tt
index 086203bd6f..9a2839c75c 100644
--- a/exercises/dominoes/example.tt
+++ b/exercises/dominoes/example.tt
@@ -3,7 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'dominoes'
 
-# Test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class DominoesTest < Minitest::Test
 <% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
@@ -15,7 +15,7 @@ class DominoesTest < Minitest::Test
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 
   # It's infeasible to use example-based tests for this exercise,
diff --git a/exercises/gigasecond/example.tt b/exercises/gigasecond/example.tt
index 86ebd8c89d..6f2e64f18a 100644
--- a/exercises/gigasecond/example.tt
+++ b/exercises/gigasecond/example.tt
@@ -1,8 +1,7 @@
 require 'minitest/autorun'
 require_relative 'gigasecond'
 
-# Test data version: <%= sha1 %>
-
+# Common test data version: <%= abbreviated_commit_hash %>
 class GigasecondTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %>
@@ -17,6 +16,6 @@ class GigasecondTest < Minitest::Test<% test_cases.each do |test_case| %>
 
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/grains/example.tt b/exercises/grains/example.tt
index 6aa03653e2..5f3be36938 100644
--- a/exercises/grains/example.tt
+++ b/exercises/grains/example.tt
@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'grains'
 
-# Test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class GrainsTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -12,6 +12,6 @@ class GrainsTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/hamming/example.tt b/exercises/hamming/example.tt
index 5f4dea5e56..abd4241584 100644
--- a/exercises/hamming/example.tt
+++ b/exercises/hamming/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'hamming'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class HammingTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skipped %><% if test_case.raises_error? %>
@@ -15,6 +14,6 @@ class HammingTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/hello-world/example.tt b/exercises/hello-world/example.tt
index 2dbfbd31a6..ebf89db25e 100644
--- a/exercises/hello-world/example.tt
+++ b/exercises/hello-world/example.tt
@@ -12,8 +12,7 @@ rescue LoadError => e
   exit 1
 end
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class HelloWorldTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %><% if test_case.skipped? %>
     skip<% end %>
diff --git a/exercises/isogram/example.tt b/exercises/isogram/example.tt
index acdd7a80d7..8825aa0929 100644
--- a/exercises/isogram/example.tt
+++ b/exercises/isogram/example.tt
@@ -4,7 +4,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'isogram'
 
-# Common test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class IsogramTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skip %>
@@ -15,6 +15,6 @@ class IsogramTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/largest-series-product/example.tt b/exercises/largest-series-product/example.tt
index e3d54438c2..2cc815fdae 100644
--- a/exercises/largest-series-product/example.tt
+++ b/exercises/largest-series-product/example.tt
@@ -3,9 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'largest_series_product'
 
-# Test data version:
-# <%= sha1 %>
-#
+# Common test data version: <%= abbreviated_commit_hash %>
 class Seriestest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %><% if test_case.raises_error? %>
@@ -15,6 +13,6 @@ class Seriestest < Minitest::Test<% test_cases.each do |test_case| %>
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/leap/example.tt b/exercises/leap/example.tt
index 57fa323049..a3214faac7 100644
--- a/exercises/leap/example.tt
+++ b/exercises/leap/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'leap'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class Date
   def leap?
     raise RuntimeError, "Implement this yourself instead of using Ruby's implementation."
@@ -24,6 +23,6 @@ class YearTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/nth-prime/example.tt b/exercises/nth-prime/example.tt
index 8b4a62595f..1583a5e0f0 100644
--- a/exercises/nth-prime/example.tt
+++ b/exercises/nth-prime/example.tt
@@ -3,9 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'nth_prime'
 
-# Test data version:
-# <%= sha1 %>
-#
+# Common test data version: <%= abbreviated_commit_hash %>
 class NthPrimeTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %><% if test_case.raises_error? %>
@@ -16,6 +14,6 @@ class NthPrimeTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/pangram/example.tt b/exercises/pangram/example.tt
index 8bd214e729..f90bcdd2b1 100644
--- a/exercises/pangram/example.tt
+++ b/exercises/pangram/example.tt
@@ -4,7 +4,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'pangram'
 
-# Test data version: # <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class PangramTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skipped? %>
@@ -15,6 +15,6 @@ class PangramTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/queen-attack/example.tt b/exercises/queen-attack/example.tt
index e10ba6858f..a1184b9c6e 100644
--- a/exercises/queen-attack/example.tt
+++ b/exercises/queen-attack/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'queen_attack'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class QueenTest < Minitest::Test
 
 <% test_cases.each do |test_case| %>
@@ -17,6 +16,6 @@ class QueenTest < Minitest::Test
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/raindrops/example.tt b/exercises/raindrops/example.tt
index 8bacf242a9..5efd047f35 100644
--- a/exercises/raindrops/example.tt
+++ b/exercises/raindrops/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'raindrops'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class RaindropsTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %>
@@ -14,6 +13,6 @@ class RaindropsTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/rna-transcription/example.tt b/exercises/rna-transcription/example.tt
index 52ab06426b..e4c379a04b 100644
--- a/exercises/rna-transcription/example.tt
+++ b/exercises/rna-transcription/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'rna_transcription'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class ComplementTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -14,6 +13,6 @@ class ComplementTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/roman-numerals/example.tt b/exercises/roman-numerals/example.tt
index c946c6a154..3ea7808043 100644
--- a/exercises/roman-numerals/example.tt
+++ b/exercises/roman-numerals/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'roman_numerals'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class RomanNumeralsTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %>
@@ -14,6 +13,6 @@ class RomanNumeralsTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/run-length-encoding/example.tt b/exercises/run-length-encoding/example.tt
index e2ec280b1b..411a955e1b 100644
--- a/exercises/run-length-encoding/example.tt
+++ b/exercises/run-length-encoding/example.tt
@@ -4,8 +4,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'run_length_encoding'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class RunLengthEncodingTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %>
@@ -17,6 +16,6 @@ class RunLengthEncodingTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/sieve/example.tt b/exercises/sieve/example.tt
index 80e1848262..5c4f6077fa 100644
--- a/exercises/sieve/example.tt
+++ b/exercises/sieve/example.tt
@@ -3,9 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'sieve'
 
-# Test data version:
-# <%= sha1 %>
-
+# Common test data version: <%= abbreviated_commit_hash %>
 class SieveTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skipped %>
@@ -16,6 +14,6 @@ class SieveTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/tournament/example.tt b/exercises/tournament/example.tt
index 10e84d436a..e6858cf16c 100644
--- a/exercises/tournament/example.tt
+++ b/exercises/tournament/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'tournament'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class TournamentTest < Minitest::Test
 <% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
@@ -18,6 +17,6 @@ class TournamentTest < Minitest::Test
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/transpose/example.tt b/exercises/transpose/example.tt
index bd4b23e3c3..8767b3963e 100644
--- a/exercises/transpose/example.tt
+++ b/exercises/transpose/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'transpose'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class TransposeTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -17,6 +16,6 @@ class TransposeTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/triangle/example.tt b/exercises/triangle/example.tt
index 7a4cac18a9..b98d5b75d2 100644
--- a/exercises/triangle/example.tt
+++ b/exercises/triangle/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'triangle'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class TriangleTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -14,7 +13,7 @@ class TriangleTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
 
diff --git a/exercises/two-bucket/example.tt b/exercises/two-bucket/example.tt
index 06c9eb6caf..06328aadaa 100644
--- a/exercises/two-bucket/example.tt
+++ b/exercises/two-bucket/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'two_bucket'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class TwoBucketTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %><% if test_case.skipped? %>
     skip<% end %>
@@ -14,6 +13,6 @@ class TwoBucketTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/word-count/example.tt b/exercises/word-count/example.tt
index e5ca51b921..7661a1c50d 100644
--- a/exercises/word-count/example.tt
+++ b/exercises/word-count/example.tt
@@ -3,8 +3,7 @@ gem 'minitest', '>= 5.0.0'
 require 'minitest/autorun'
 require_relative 'word_count'
 
-# Test data version:
-# <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class PhraseTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %><% if test_case.skipped? %>
     skip<% end %>
@@ -16,7 +15,7 @@ class PhraseTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
 
diff --git a/exercises/wordy/example.tt b/exercises/wordy/example.tt
index c109ab9814..3a7203f5d7 100644
--- a/exercises/wordy/example.tt
+++ b/exercises/wordy/example.tt
@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'wordy'
 
-# Test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class WordyTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
@@ -12,6 +12,6 @@ class WordyTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/lib/acronym_cases.rb b/lib/acronym_cases.rb
index 67233833f6..3399b83655 100644
--- a/lib/acronym_cases.rb
+++ b/lib/acronym_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AcronymCase < OpenStruct
   def name
     'test_%s' % description.tr(' ', '_')
diff --git a/lib/all_your_base_cases.rb b/lib/all_your_base_cases.rb
index da32c8462b..c5e418f1b9 100644
--- a/lib/all_your_base_cases.rb
+++ b/lib/all_your_base_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AllYourBaseCase < OpenStruct
   def test_name
     'test_%s' % description.downcase.tr(' -', '_')
diff --git a/lib/alphametics_cases.rb b/lib/alphametics_cases.rb
index d1534e4770..7824aa4381 100644
--- a/lib/alphametics_cases.rb
+++ b/lib/alphametics_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AlphameticsCase < OpenStruct
   def test_name
     "test_#{description.tr(' ', '_')}"
diff --git a/lib/anagram_cases.rb b/lib/anagram_cases.rb
index d21cb62cba..e91baece95 100644
--- a/lib/anagram_cases.rb
+++ b/lib/anagram_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class AnagramCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
diff --git a/lib/binary_cases.rb b/lib/binary_cases.rb
index 806db5db93..3c3dc41962 100644
--- a/lib/binary_cases.rb
+++ b/lib/binary_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class BinaryCase < OpenStruct
   def name
     'test_%s' % description.gsub(/[ -]/, '_')
diff --git a/lib/bowling_cases.rb b/lib/bowling_cases.rb
index a92448ce42..b69503a556 100644
--- a/lib/bowling_cases.rb
+++ b/lib/bowling_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class BowlingCase < OpenStruct
   def test_name
     "test_#{description.downcase.tr(' ', '_')}"
diff --git a/lib/bracket_push_cases.rb b/lib/bracket_push_cases.rb
index 61d425bc4f..52c8ce6941 100644
--- a/lib/bracket_push_cases.rb
+++ b/lib/bracket_push_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class BracketPushCase < OpenStruct
   def name
     'test_%s' % description.gsub(/[ -]/, '_')
diff --git a/lib/clock_cases.rb b/lib/clock_cases.rb
index 5be31944b2..bc09e811b0 100644
--- a/lib/clock_cases.rb
+++ b/lib/clock_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class ClockCase < OpenStruct
   def name
     'test_%s' % description
diff --git a/lib/connect_cases.rb b/lib/connect_cases.rb
index 3219e0c5a4..9a4e11a16c 100644
--- a/lib/connect_cases.rb
+++ b/lib/connect_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class ConnectCase < OpenStruct
   def name
     'test_%s' % description
diff --git a/lib/custom_set_cases.rb b/lib/custom_set_cases.rb
index 3bd47c9688..9111971aac 100644
--- a/lib/custom_set_cases.rb
+++ b/lib/custom_set_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class CustomSetCase < OpenStruct
   def name
     'test_%s' % description.gsub(/ |-/, '_')
diff --git a/lib/difference_of_squares_cases.rb b/lib/difference_of_squares_cases.rb
index 4baf7d4cf9..19993699a0 100644
--- a/lib/difference_of_squares_cases.rb
+++ b/lib/difference_of_squares_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class DifferenceOfSquaresCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
diff --git a/lib/dominoes_cases.rb b/lib/dominoes_cases.rb
index 1bc60629e2..e210918c5b 100644
--- a/lib/dominoes_cases.rb
+++ b/lib/dominoes_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class DominoesCase < OpenStruct
   def test_name
     'test_%s' % description.gsub("can't", 'can not').gsub(/[= -]+/, '_')
diff --git a/lib/exercise_cases.rb b/lib/exercise_cases.rb
new file mode 100644
index 0000000000..2bf9289798
--- /dev/null
+++ b/lib/exercise_cases.rb
@@ -0,0 +1,2 @@
+require 'ostruct'
+require 'json'
diff --git a/lib/generator/template_values.rb b/lib/generator/template_values.rb
index b085fbacad..a1aac124f5 100644
--- a/lib/generator/template_values.rb
+++ b/lib/generator/template_values.rb
@@ -1,10 +1,10 @@
 module Generator
   # Contains methods accessible to the ERB template
   class TemplateValues
-    attr_reader :sha1, :version, :test_cases
+    attr_reader :abbreviated_commit_hash, :version, :test_cases
 
-    def initialize(sha1:, version:, test_cases:)
-      @sha1 = sha1
+    def initialize(abbreviated_commit_hash:, version:, test_cases:)
+      @abbreviated_commit_hash = abbreviated_commit_hash
       @version = version
       @test_cases = test_cases
     end
@@ -16,20 +16,11 @@ def get_binding
 
   module TemplateValuesFactory
     def template_values
-      # These are needed by the 'ExerciseCases' classes
-      # TODO: move these into the individual classes
-      require 'ostruct'
-      require 'json'
       require cases_require_name
 
-      # Compensate for the version.next that appears in template files.
-      # TODO: remove the .next from the template files and remove compensation
-      compensated_version = version - 1
-
       TemplateValues.new(
-        # TODO: rename sha1 to abbreviated_commit_hash
-        sha1: canonical_data.abbreviated_commit_hash,
-        version: compensated_version,
+        abbreviated_commit_hash: canonical_data.abbreviated_commit_hash,
+        version: version,
         test_cases: test_cases_proc.call(canonical_data.to_s)
       )
     end
diff --git a/lib/gigasecond_cases.rb b/lib/gigasecond_cases.rb
index 6fed08e408..6ffb88aa67 100644
--- a/lib/gigasecond_cases.rb
+++ b/lib/gigasecond_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 require 'time'
 
 class GigasecondCase < OpenStruct
diff --git a/lib/grains_cases.rb b/lib/grains_cases.rb
index cd44a3b3e2..d343ed9f77 100644
--- a/lib/grains_cases.rb
+++ b/lib/grains_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class GrainsCase < OpenStruct
   def test_name
     'test_%s' % description.downcase.tr_s(' ', '_')
diff --git a/lib/hamming_cases.rb b/lib/hamming_cases.rb
index edbb3acd8c..b3b7289e4e 100644
--- a/lib/hamming_cases.rb
+++ b/lib/hamming_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class HammingCase < OpenStruct
   def name
     'test_%s' % description.gsub(/[ -]/, '_')
diff --git a/lib/hello_world_cases.rb b/lib/hello_world_cases.rb
index d8499d9d9e..2e836056be 100644
--- a/lib/hello_world_cases.rb
+++ b/lib/hello_world_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class HelloWorldCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
diff --git a/lib/isogram_cases.rb b/lib/isogram_cases.rb
index ec90bab1e4..7248108757 100644
--- a/lib/isogram_cases.rb
+++ b/lib/isogram_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class IsogramCase < OpenStruct
 
   def name
diff --git a/lib/largest_series_product_cases.rb b/lib/largest_series_product_cases.rb
index 6c1ae8c3da..1cf2484a97 100644
--- a/lib/largest_series_product_cases.rb
+++ b/lib/largest_series_product_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class LargestSeriesProductCase < OpenStruct
   def name
     'test_%s' % description.tr('()', '').tr(' -', '_').downcase
diff --git a/lib/leap_cases.rb b/lib/leap_cases.rb
index 8092ca7315..7f0f14b705 100644
--- a/lib/leap_cases.rb
+++ b/lib/leap_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class LeapCase < OpenStruct
   def name
     'test_%s' % description.downcase.gsub(/[ -]/, '_')
diff --git a/lib/nth_prime_cases.rb b/lib/nth_prime_cases.rb
index bbaa736c30..4cb4824d65 100644
--- a/lib/nth_prime_cases.rb
+++ b/lib/nth_prime_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class NthPrimeCase < OpenStruct
   def name
     'test_%s' % description.downcase.gsub(/[ -]/, '_')
diff --git a/lib/pangram_cases.rb b/lib/pangram_cases.rb
index e04ac0518c..c40e13c5b5 100644
--- a/lib/pangram_cases.rb
+++ b/lib/pangram_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class PangramCase < OpenStruct
   def name
     'test_%s' % description.downcase.tr_s(" -'", '_').sub(/_$/, '')
diff --git a/lib/queen_attack_cases.rb b/lib/queen_attack_cases.rb
index 181dcbba82..11aa229ecb 100644
--- a/lib/queen_attack_cases.rb
+++ b/lib/queen_attack_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class QueenCase < OpenStruct
   def test_name
     "test_#{description.gsub(/[ ]/, '_')}"
diff --git a/lib/raindrops_cases.rb b/lib/raindrops_cases.rb
index 0fd9933b15..2b8487d46d 100644
--- a/lib/raindrops_cases.rb
+++ b/lib/raindrops_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RaindropsCase < OpenStruct
   def name
     'test_%s' % number
diff --git a/lib/rna_transcription_cases.rb b/lib/rna_transcription_cases.rb
index 750373a4d9..98173a6c4b 100644
--- a/lib/rna_transcription_cases.rb
+++ b/lib/rna_transcription_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RnaTranscriptionCase < OpenStruct
   def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
diff --git a/lib/roman_numerals_cases.rb b/lib/roman_numerals_cases.rb
index dbee670108..e193d061d4 100644
--- a/lib/roman_numerals_cases.rb
+++ b/lib/roman_numerals_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RomanNumeralsCase < OpenStruct
   def name
     'test_%s' % number.to_s
diff --git a/lib/run_length_encoding_cases.rb b/lib/run_length_encoding_cases.rb
index 32ce39d763..7816ff9411 100644
--- a/lib/run_length_encoding_cases.rb
+++ b/lib/run_length_encoding_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class RunLengthEncodingCase < OpenStruct
   def name
     'test_%s' % cleaned_description
diff --git a/lib/sieve_cases.rb b/lib/sieve_cases.rb
index 01da5c4198..ff109c68ef 100644
--- a/lib/sieve_cases.rb
+++ b/lib/sieve_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class SieveCase < OpenStruct
   OPEN_ARRAY = "[\n\s\s\s\s\s\s".freeze
   CLOSE_ARRAY = "\n\s\s\s\s]".freeze
diff --git a/lib/tournament_cases.rb b/lib/tournament_cases.rb
index a4f8b82d30..ea1675ce5c 100644
--- a/lib/tournament_cases.rb
+++ b/lib/tournament_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TournamentCase < OpenStruct
   def test_name
     "test_#{description.tr(' ', '_').tr('()', '')}"
diff --git a/lib/transpose_cases.rb b/lib/transpose_cases.rb
index ddbf131dd4..e29923ec65 100644
--- a/lib/transpose_cases.rb
+++ b/lib/transpose_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TransposeCase < OpenStruct
   def test_name
     "test_#{description.tr(' ', '_')}"
diff --git a/lib/triangle_cases.rb b/lib/triangle_cases.rb
index 09afe6a307..b07643458a 100644
--- a/lib/triangle_cases.rb
+++ b/lib/triangle_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TriangleCase < OpenStruct
   def test_name
     initial = description.downcase
diff --git a/lib/two_bucket_cases.rb b/lib/two_bucket_cases.rb
index 7280475b0b..c1350552f7 100644
--- a/lib/two_bucket_cases.rb
+++ b/lib/two_bucket_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class TwoBucketCase < OpenStruct
   def test_name
     "test_bucket_one_#{bucket_one}_bucket_two_"\
diff --git a/lib/word_count_cases.rb b/lib/word_count_cases.rb
index ca4c95ef9a..3ebc3583fe 100644
--- a/lib/word_count_cases.rb
+++ b/lib/word_count_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class WordCountCase < OpenStruct
   def name
     'test_%s' % description.tr(' ', '_')
diff --git a/lib/wordy_cases.rb b/lib/wordy_cases.rb
index 15642f02a6..bd12581d75 100644
--- a/lib/wordy_cases.rb
+++ b/lib/wordy_cases.rb
@@ -1,3 +1,5 @@
+require 'exercise_cases'
+
 class WordyCase < OpenStruct
   def test_name
     'test_%s' % description.downcase.tr(' ', '_')
diff --git a/test/fixtures/xruby/exercises/alpha/example.tt b/test/fixtures/xruby/exercises/alpha/example.tt
index d8f73965f3..8a4f25ff50 100644
--- a/test/fixtures/xruby/exercises/alpha/example.tt
+++ b/test/fixtures/xruby/exercises/alpha/example.tt
@@ -4,7 +4,7 @@
 require 'minitest/autorun'
 require_relative 'alpha'
 
-# Common test data version: <%= sha1 %>
+# Common test data version: <%= abbreviated_commit_hash %>
 class AlphaTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.name %>
     <%= test_case.skip %>
@@ -15,6 +15,6 @@ class AlphaTest < Minitest::Test<% test_cases.each do |test_case| %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version.next %>, BookKeeping::VERSION
+    assert_equal <%= version %>, BookKeeping::VERSION
   end
 end
diff --git a/test/generator/template_values_test.rb b/test/generator/template_values_test.rb
index ea4be0e474..75abf8abf9 100644
--- a/test/generator/template_values_test.rb
+++ b/test/generator/template_values_test.rb
@@ -2,26 +2,26 @@
 
 module Generator
   class TestCasesValuesTest < Minitest::Test
-    def test_sha1
-      expected_sha1 = '1234567'
-      subject = TemplateValues.new(sha1: expected_sha1, version: nil, test_cases: nil)
-      assert_equal expected_sha1, subject.sha1
+    def test_abbreviated_commit_hash
+      expected_abbreviated_commit_hash = '1234567'
+      subject = TemplateValues.new(abbreviated_commit_hash: expected_abbreviated_commit_hash, version: nil, test_cases: nil)
+      assert_equal expected_abbreviated_commit_hash, subject.abbreviated_commit_hash
     end
 
     def test_version
       expected_version = '1234567'
-      subject = TemplateValues.new(version: expected_version, sha1: nil, test_cases: nil)
+      subject = TemplateValues.new(version: expected_version, abbreviated_commit_hash: nil, test_cases: nil)
       assert_equal expected_version, subject.version
     end
 
     def test_test_cases
       expected_test_cases = 'should be TemplateValues class'
-      subject = TemplateValues.new(test_cases: expected_test_cases, sha1: nil, version: nil)
+      subject = TemplateValues.new(test_cases: expected_test_cases, abbreviated_commit_hash: nil, version: nil)
       assert_equal expected_test_cases, subject.test_cases
     end
 
     def test_get_binding
-      subject = TemplateValues.new(sha1: nil, version: nil, test_cases: nil)
+      subject = TemplateValues.new(abbreviated_commit_hash: nil, version: nil, test_cases: nil)
       assert_instance_of Binding, subject.get_binding
     end
   end