diff --git a/auto/colour_prompt.rb b/auto/colour_prompt.rb
index bf09d02..85cbfd8 100644
--- a/auto/colour_prompt.rb
+++ b/auto/colour_prompt.rb
@@ -22,6 +22,7 @@ end
 class ColourCommandLine
   def initialize
     return unless RUBY_PLATFORM =~ /(win|w)32$/
+
     get_std_handle = Win32API.new('kernel32', 'GetStdHandle', ['L'], 'L')
     @set_console_txt_attrb =
       Win32API.new('kernel32', 'SetConsoleTextAttribute', %w[L N], 'I')
diff --git a/auto/generate_module.rb b/auto/generate_module.rb
index def5d08..eb2cebd 100644
--- a/auto/generate_module.rb
+++ b/auto/generate_module.rb
@@ -264,6 +264,7 @@ if $0 == __FILE__
     when /^-y\"?(.+)\"?/  then options = UnityModuleGenerator.grab_config(Regexp.last_match(1))
     when /^(\w+)/
       raise "ERROR: You can't have more than one Module name specified!" unless module_name.nil?
+
       module_name = arg
     when /^-(h|-help)/
       ARGV = [].freeze
@@ -298,6 +299,7 @@ if $0 == __FILE__
   end
 
   raise 'ERROR: You must have a Module name specified! (use option -h for help)' if module_name.nil?
+
   if destroy
     UnityModuleGenerator.new(options).destroy(module_name)
   else
diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb
index 9016f9a..ea75f4c 100644
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -61,11 +61,11 @@ class UnityTestRunnerGenerator
     # pull required data from source file
     source = File.read(input_file)
     source = source.force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
-    tests               = find_tests(source)
-    headers             = find_includes(source)
-    testfile_includes   = (headers[:local] + headers[:system])
-    used_mocks          = find_mocks(testfile_includes)
-    testfile_includes   = (testfile_includes - used_mocks)
+    tests = find_tests(source)
+    headers = find_includes(source)
+    testfile_includes = (headers[:local] + headers[:system])
+    used_mocks = find_mocks(testfile_includes)
+    testfile_includes = (testfile_includes - used_mocks)
     testfile_includes.delete_if { |inc| inc =~ /(unity|cmock)/ }
     find_setup_and_teardown(source)
 
@@ -127,17 +127,21 @@ class UnityTestRunnerGenerator
     lines.each_with_index do |line, _index|
       # find tests
       next unless line =~ /^((?:\s*TEST_CASE\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]}).*)\s*\(\s*(.*)\s*\)/m
+
       arguments = Regexp.last_match(1)
       name = Regexp.last_match(2)
       call = Regexp.last_match(3)
       params = Regexp.last_match(4)
       args = nil
+
       if @options[:use_param_tests] && !arguments.empty?
         args = []
         arguments.scan(/\s*TEST_CASE\s*\((.*)\)\s*$/) { |a| args << a[0] }
       end
+
       tests_and_line_numbers << { test: name, args: args, call: call, params: params, line_number: 0 }
     end
+
     tests_and_line_numbers.uniq! { |v| v[:test] }
 
     # determine line numbers and create tests to run
@@ -146,6 +150,7 @@ class UnityTestRunnerGenerator
     tests_and_line_numbers.size.times do |i|
       source_lines[source_index..-1].each_with_index do |line, index|
         next unless line =~ /\s+#{tests_and_line_numbers[i][:test]}(?:\s|\()/
+
         source_index += index
         tests_and_line_numbers[i][:line_number] = source_index + 1
         break
@@ -266,18 +271,21 @@ class UnityTestRunnerGenerator
 
   def create_setup(output)
     return if @options[:has_setup]
+
     output.puts("\n/*=======Setup (stub)=====*/")
     output.puts("void #{@options[:setup_name]}(void) {}")
   end
 
   def create_teardown(output)
     return if @options[:has_teardown]
+
     output.puts("\n/*=======Teardown (stub)=====*/")
     output.puts("void #{@options[:teardown_name]}(void) {}")
   end
 
   def create_suite_setup(output)
     return if @options[:suite_setup].nil?
+
     output.puts("\n/*=======Suite Setup=====*/")
     output.puts('void suiteSetUp(void)')
     output.puts('{')
@@ -287,6 +295,7 @@ class UnityTestRunnerGenerator
 
   def create_suite_teardown(output)
     return if @options[:suite_teardown].nil?
+
     output.puts("\n/*=======Suite Teardown=====*/")
     output.puts('int suiteTearDown(int num_failures)')
     output.puts('{')
@@ -315,9 +324,11 @@ class UnityTestRunnerGenerator
 
   def create_args_wrappers(output, tests)
     return unless @options[:use_param_tests]
+
     output.puts("\n/*=======Parameterized Test Wrappers=====*/")
     tests.each do |test|
       next if test[:args].nil? || test[:args].empty?
+
       test[:args].each.with_index(1) do |args, idx|
         output.puts("static void runner_args#{idx}_#{test[:test]}(void)")
         output.puts('{')
diff --git a/auto/parse_output.rb b/auto/parse_output.rb
index fa07b7d..d72c6e8 100644
--- a/auto/parse_output.rb
+++ b/auto/parse_output.rb
@@ -34,9 +34,9 @@ class ParseOutput
 
     # current suite name and statistics
     @test_suite = nil
-    @total_tests  = 0
-    @test_passed  = 0
-    @test_failed  = 0
+    @total_tests = 0
+    @test_passed = 0
+    @test_failed = 0
     @test_ignored = 0
   end
 
diff --git a/auto/stylize_as_junit.rb b/auto/stylize_as_junit.rb
index a53f85f..e01f791 100755
--- a/auto/stylize_as_junit.rb
+++ b/auto/stylize_as_junit.rb
@@ -152,6 +152,7 @@ class UnityToJUnit
 
   def parse_test_summary(summary)
     raise "Couldn't parse test results: #{summary}" unless summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
+
     [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
   end
 
@@ -230,7 +231,9 @@ if $0 == __FILE__
     targets = "#{options.results_dir.tr('\\', '/')}**/*.test*"
 
     results = Dir[targets]
+
     raise "No *.testpass, *.testfail, or *.testresults files found in '#{targets}'" if results.empty?
+
     utj.targets = results
 
     # set the root path
diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb
index 810fdbd..b3fe8a6 100644
--- a/auto/unity_test_summary.rb
+++ b/auto/unity_test_summary.rb
@@ -99,6 +99,7 @@ class UnityTestSummary
 
   def parse_test_summary(summary)
     raise "Couldn't parse test results: #{summary}" unless summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
+
     [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
   end
 end
@@ -117,7 +118,9 @@ if $0 == __FILE__
     args[0] ||= './'
     targets = "#{ARGV[0].tr('\\', '/')}**/*.test*"
     results = Dir[targets]
+
     raise "No *.testpass, *.testfail, or *.testresults files found in '#{targets}'" if results.empty?
+
     uts.targets = results
 
     # set the root path
diff --git a/examples/example_3/rakefile.rb b/examples/example_3/rakefile.rb
index d014929..c095af3 100644
--- a/examples/example_3/rakefile.rb
+++ b/examples/example_3/rakefile.rb
@@ -13,8 +13,6 @@ end
 
 task prepare_for_tests: TEMP_DIRS
 
-include RakefileHelpers
-
 # Load default configuration, for now
 DEFAULT_CONFIG_FILE = 'target_gcc_32.yml'.freeze
 configure_toolchain(DEFAULT_CONFIG_FILE)
diff --git a/examples/example_3/rakefile_helper.rb b/examples/example_3/rakefile_helper.rb
index 0e249b7..64d20c9 100644
--- a/examples/example_3/rakefile_helper.rb
+++ b/examples/example_3/rakefile_helper.rb
@@ -4,246 +4,247 @@ require_relative '../../auto/unity_test_summary'
 require_relative '../../auto/generate_test_runner'
 require_relative '../../auto/colour_reporter'
 
-module RakefileHelpers
-  C_EXTENSION = '.c'.freeze
+C_EXTENSION = '.c'.freeze
 
-  def load_configuration(config_file)
-    $cfg_file = config_file
-    $cfg = YAML.load(File.read($cfg_file))
+def load_configuration(config_file)
+  $cfg_file = config_file
+  $cfg = YAML.load(File.read($cfg_file))
+end
+
+def configure_clean
+  CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
+end
+
+def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
+  config_file += '.yml' unless config_file =~ /\.yml$/
+  load_configuration(config_file)
+  configure_clean
+end
+
+def unit_test_files
+  path = $cfg['compiler']['unit_tests_path'] + 'Test*' + C_EXTENSION
+  path.tr!('\\', '/')
+  FileList.new(path)
+end
+
+def local_include_dirs
+  include_dirs = $cfg['compiler']['includes']['items'].dup
+  include_dirs.delete_if { |dir| dir.is_a?(Array) }
+  include_dirs
+end
+
+def extract_headers(filename)
+  includes = []
+  lines = File.readlines(filename)
+  lines.each do |line|
+    m = line.match(/^\s*#include\s+\"\s*(.+\.[hH])\s*\"/)
+    includes << m[1] unless m.nil?
   end
+  includes
+end
 
-  def configure_clean
-    CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
+def find_source_file(header, paths)
+  paths.each do |dir|
+    src_file = dir + header.ext(C_EXTENSION)
+    return src_file if File.exist?(src_file)
   end
+  nil
+end
 
-  def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
-    config_file += '.yml' unless config_file =~ /\.yml$/
-    load_configuration(config_file)
-    configure_clean
-  end
+def tackit(strings)
+  result = if strings.is_a?(Array)
+             "\"#{strings.join}\""
+           else
+             strings
+           end
+  result
+end
 
-  def unit_test_files
-    path = $cfg['compiler']['unit_tests_path'] + 'Test*' + C_EXTENSION
-    path.tr!('\\', '/')
-    FileList.new(path)
-  end
+def squash(prefix, items)
+  result = ''
+  items.each { |item| result += " #{prefix}#{tackit(item)}" }
+  result
+end
 
-  def local_include_dirs
-    include_dirs = $cfg['compiler']['includes']['items'].dup
-    include_dirs.delete_if { |dir| dir.is_a?(Array) }
-    include_dirs
-  end
+def build_compiler_fields
+  command = tackit($cfg['compiler']['path'])
+  defines = if $cfg['compiler']['defines']['items'].nil?
+              ''
+            else
+              squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'])
+            end
+  options = squash('', $cfg['compiler']['options'])
+  includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
+  includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
 
-  def extract_headers(filename)
-    includes = []
-    lines = File.readlines(filename)
-    lines.each do |line|
-      m = line.match(/^\s*#include\s+\"\s*(.+\.[hH])\s*\"/)
-      includes << m[1] unless m.nil?
-    end
-    includes
-  end
+  { command: command, defines: defines, options: options, includes: includes }
+end
 
-  def find_source_file(header, paths)
-    paths.each do |dir|
-      src_file = dir + header.ext(C_EXTENSION)
-      return src_file if File.exist?(src_file)
-    end
-    nil
-  end
+def compile(file, _defines = [])
+  compiler = build_compiler_fields
+  cmd_str  = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{file} " \
+             "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}"
+  obj_file = "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
+  execute(cmd_str + obj_file)
+  obj_file
+end
 
-  def tackit(strings)
-    result = if strings.is_a?(Array)
-               "\"#{strings.join}\""
+def build_linker_fields
+  command = tackit($cfg['linker']['path'])
+  options = if $cfg['linker']['options'].nil?
+              ''
+            else
+              squash('', $cfg['linker']['options'])
+            end
+  includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
+               ''
              else
-               strings
-             end
-    result
-  end
+               squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
+             end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
 
-  def squash(prefix, items)
-    result = ''
-    items.each { |item| result += " #{prefix}#{tackit(item)}" }
-    result
-  end
+  { command: command, options: options, includes: includes }
+end
 
-  def build_compiler_fields
-    command = tackit($cfg['compiler']['path'])
-    defines = if $cfg['compiler']['defines']['items'].nil?
-                ''
-              else
-                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'])
-              end
-    options  = squash('', $cfg['compiler']['options'])
-    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
-    includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
+def link_it(exe_name, obj_list)
+  linker = build_linker_fields
+  cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
+            (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
+            $cfg['linker']['bin_files']['prefix'] + ' ' +
+            $cfg['linker']['bin_files']['destination'] +
+            exe_name + $cfg['linker']['bin_files']['extension']
+  execute(cmd_str)
+end
 
-    { command: command, defines: defines, options: options, includes: includes }
-  end
+def build_simulator_fields
+  return nil if $cfg['simulator'].nil?
 
-  def compile(file, _defines = [])
-    compiler = build_compiler_fields
-    cmd_str  = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{file} " \
-               "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}"
-    obj_file = "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
-    execute(cmd_str + obj_file)
-    obj_file
-  end
-
-  def build_linker_fields
-    command = tackit($cfg['linker']['path'])
-    options = if $cfg['linker']['options'].nil?
-                ''
-              else
-                squash('', $cfg['linker']['options'])
-              end
-    includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
-                 ''
-               else
-                 squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
-               end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, options: options, includes: includes }
-  end
-
-  def link_it(exe_name, obj_list)
-    linker = build_linker_fields
-    cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
-              (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
-              $cfg['linker']['bin_files']['prefix'] + ' ' +
-              $cfg['linker']['bin_files']['destination'] +
-              exe_name + $cfg['linker']['bin_files']['extension']
-    execute(cmd_str)
-  end
-
-  def build_simulator_fields
-    return nil if $cfg['simulator'].nil?
-    command = if $cfg['simulator']['path'].nil?
-                ''
-              else
-                (tackit($cfg['simulator']['path']) + ' ')
-              end
-    pre_support = if $cfg['simulator']['pre_support'].nil?
-                    ''
-                  else
-                    squash('', $cfg['simulator']['pre_support'])
-                  end
-    post_support = if $cfg['simulator']['post_support'].nil?
-                     ''
-                   else
-                     squash('', $cfg['simulator']['post_support'])
-                   end
-
-    { command: command, pre_support: pre_support, post_support: post_support }
-  end
-
-  def execute(command_string, verbose = true, raise_on_fail = true)
-    report command_string
-    output = `#{command_string}`.chomp
-    report(output) if verbose && !output.nil? && !output.empty?
-    if !$?.nil? && !$?.exitstatus.zero? && raise_on_fail
-      raise "Command failed. (Returned #{$?.exitstatus})"
-    end
-    output
-  end
-
-  def report_summary
-    summary = UnityTestSummary.new
-    summary.root = __dir__
-    results_glob = "#{$cfg['compiler']['build_path']}*.test*"
-    results_glob.tr!('\\', '/')
-    results = Dir[results_glob]
-    summary.targets = results
-    summary.run
-    fail_out 'FAIL: There were failures' if summary.failures > 0
-  end
-
-  def run_tests(test_files)
-    report 'Running system tests...'
-
-    # Tack on TEST define for compiling unit tests
-    load_configuration($cfg_file)
-    test_defines = ['TEST']
-    $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
-    $cfg['compiler']['defines']['items'] << 'TEST'
-
-    include_dirs = local_include_dirs
-
-    # Build and execute each unit test
-    test_files.each do |test|
-      obj_list = []
-
-      # Detect dependencies and build required required modules
-      extract_headers(test).each do |header|
-        # Compile corresponding source file if it exists
-        src_file = find_source_file(header, include_dirs)
-        obj_list << compile(src_file, test_defines) unless src_file.nil?
-      end
-
-      # Build the test runner (generate if configured to do so)
-      test_base = File.basename(test, C_EXTENSION)
-      runner_name = test_base + '_Runner.c'
-      if $cfg['compiler']['runner_path'].nil?
-        runner_path = $cfg['compiler']['build_path'] + runner_name
-        test_gen = UnityTestRunnerGenerator.new($cfg_file)
-        test_gen.run(test, runner_path)
-      else
-        runner_path = $cfg['compiler']['runner_path'] + runner_name
-      end
-
-      obj_list << compile(runner_path, test_defines)
-
-      # Build the test module
-      obj_list << compile(test, test_defines)
-
-      # Link the test executable
-      link_it(test_base, obj_list)
-
-      # Execute unit test and generate results file
-      simulator = build_simulator_fields
-      executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
-      cmd_str = if simulator.nil?
-                  executable
+  command = if $cfg['simulator']['path'].nil?
+              ''
+            else
+              (tackit($cfg['simulator']['path']) + ' ')
+            end
+  pre_support = if $cfg['simulator']['pre_support'].nil?
+                  ''
                 else
-                  "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
+                  squash('', $cfg['simulator']['pre_support'])
                 end
-      output = execute(cmd_str, true, false)
-      test_results = $cfg['compiler']['build_path'] + test_base
-      test_results += if output.match(/OK$/m).nil?
-                        '.testfail'
-                      else
-                        '.testpass'
-                      end
-      File.open(test_results, 'w') { |f| f.print output }
-    end
+  post_support = if $cfg['simulator']['post_support'].nil?
+                   ''
+                 else
+                   squash('', $cfg['simulator']['post_support'])
+                 end
+
+  { command: command, pre_support: pre_support, post_support: post_support }
+end
+
+def execute(command_string, verbose = true, raise_on_fail = true)
+  report command_string
+  output = `#{command_string}`.chomp
+  report(output) if verbose && !output.nil? && !output.empty?
+
+  if !$?.nil? && !$?.exitstatus.zero? && raise_on_fail
+    raise "Command failed. (Returned #{$?.exitstatus})"
   end
 
-  def build_application(main)
-    report 'Building application...'
+  output
+end
 
+def report_summary
+  summary = UnityTestSummary.new
+  summary.root = __dir__
+  results_glob = "#{$cfg['compiler']['build_path']}*.test*"
+  results_glob.tr!('\\', '/')
+  results = Dir[results_glob]
+  summary.targets = results
+  summary.run
+  fail_out 'FAIL: There were failures' if summary.failures > 0
+end
+
+def run_tests(test_files)
+  report 'Running system tests...'
+
+  # Tack on TEST define for compiling unit tests
+  load_configuration($cfg_file)
+  test_defines = ['TEST']
+  $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
+  $cfg['compiler']['defines']['items'] << 'TEST'
+
+  include_dirs = local_include_dirs
+
+  # Build and execute each unit test
+  test_files.each do |test|
     obj_list = []
-    load_configuration($cfg_file)
-    main_path = $cfg['compiler']['source_path'] + main + C_EXTENSION
 
     # Detect dependencies and build required required modules
-    include_dirs = get_local_include_dirs
-    extract_headers(main_path).each do |header|
+    extract_headers(test).each do |header|
+      # Compile corresponding source file if it exists
       src_file = find_source_file(header, include_dirs)
-      obj_list << compile(src_file) unless src_file.nil?
+      obj_list << compile(src_file, test_defines) unless src_file.nil?
     end
 
-    # Build the main source file
-    main_base = File.basename(main_path, C_EXTENSION)
-    obj_list << compile(main_path)
+    # Build the test runner (generate if configured to do so)
+    test_base = File.basename(test, C_EXTENSION)
+    runner_name = test_base + '_Runner.c'
+    if $cfg['compiler']['runner_path'].nil?
+      runner_path = $cfg['compiler']['build_path'] + runner_name
+      test_gen = UnityTestRunnerGenerator.new($cfg_file)
+      test_gen.run(test, runner_path)
+    else
+      runner_path = $cfg['compiler']['runner_path'] + runner_name
+    end
 
-    # Create the executable
-    link_it(main_base, obj_list)
-  end
+    obj_list << compile(runner_path, test_defines)
 
-  def fail_out(msg)
-    puts msg
-    puts 'Not returning exit code so continuous integration can pass'
-    #    exit(-1) # Only removed to pass example_3, which has failing tests on purpose.
-    #               Still fail if the build fails for any other reason.
+    # Build the test module
+    obj_list << compile(test, test_defines)
+
+    # Link the test executable
+    link_it(test_base, obj_list)
+
+    # Execute unit test and generate results file
+    simulator = build_simulator_fields
+    executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
+    cmd_str = if simulator.nil?
+                executable
+              else
+                "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
+              end
+    output = execute(cmd_str, true, false)
+    test_results = $cfg['compiler']['build_path'] + test_base
+    test_results += if output.match(/OK$/m).nil?
+                      '.testfail'
+                    else
+                      '.testpass'
+                    end
+    File.open(test_results, 'w') { |f| f.print output }
   end
 end
+
+def build_application(main)
+  report 'Building application...'
+
+  obj_list = []
+  load_configuration($cfg_file)
+  main_path = $cfg['compiler']['source_path'] + main + C_EXTENSION
+
+  # Detect dependencies and build required required modules
+  include_dirs = get_local_include_dirs
+  extract_headers(main_path).each do |header|
+    src_file = find_source_file(header, include_dirs)
+    obj_list << compile(src_file) unless src_file.nil?
+  end
+
+  # Build the main source file
+  main_base = File.basename(main_path, C_EXTENSION)
+  obj_list << compile(main_path)
+
+  # Create the executable
+  link_it(main_base, obj_list)
+end
+
+def fail_out(msg)
+  puts msg
+  puts 'Not returning exit code so continuous integration can pass'
+  #    exit(-1) # Only removed to pass example_3, which has failing tests on purpose.
+  #               Still fail if the build fails for any other reason.
+end
diff --git a/extras/fixture/rakefile.rb b/extras/fixture/rakefile.rb
index 8b5319c..f746560 100644
--- a/extras/fixture/rakefile.rb
+++ b/extras/fixture/rakefile.rb
@@ -20,8 +20,6 @@ end
 
 task prepare_for_tests: TEMP_DIRS
 
-include RakefileHelpers
-
 # Load default configuration, for now
 DEFAULT_CONFIG_FILE = 'gcc_auto_stdint.yml'.freeze
 configure_toolchain(DEFAULT_CONFIG_FILE)
diff --git a/extras/fixture/rakefile_helper.rb b/extras/fixture/rakefile_helper.rb
index 71e752b..8bdb09d 100644
--- a/extras/fixture/rakefile_helper.rb
+++ b/extras/fixture/rakefile_helper.rb
@@ -10,169 +10,170 @@ require_relative '../../auto/unity_test_summary'
 require_relative '../../auto/generate_test_runner'
 require_relative '../../auto/colour_reporter'
 
-module RakefileHelpers
-  C_EXTENSION = '.c'.freeze
+C_EXTENSION = '.c'.freeze
 
-  def load_configuration(config_file)
-    return if $configured
+def load_configuration(config_file)
+  return if $configured
 
-    $cfg_file = "#{__dir__}/../../test/targets/#{config_file}" unless config_file =~ /[\\|\/]/
-    $cfg = YAML.load(File.read($cfg_file))
-    $colour_output = false unless $cfg['colour']
-    $configured = true if config_file != DEFAULT_CONFIG_FILE
-  end
-
-  def configure_clean
-    CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
-  end
-
-  def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
-    config_file += '.yml' unless config_file =~ /\.yml$/
-    config_file = config_file unless config_file =~ /[\\|\/]/
-    load_configuration(config_file)
-    configure_clean
-  end
-
-  def tackit(strings)
-    result = if strings.is_a?(Array)
-               "\"#{strings.join}\""
-             else
-               strings
-             end
-    result
-  end
-
-  def squash(prefix, items)
-    result = ''
-    items.each { |item| result += " #{prefix}#{tackit(item)}" }
-    result
-  end
-
-  def build_compiler_fields
-    command = tackit($cfg['compiler']['path'])
-    defines = if $cfg['compiler']['defines']['items'].nil?
-                ''
-              else
-                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar'] + ['UNITY_OUTPUT_CHAR_HEADER_DECLARATION=UnityOutputCharSpy_OutputChar\(int\)'])
-              end
-    options  = squash('', $cfg['compiler']['options'])
-    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
-    includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, defines: defines, options: options, includes: includes }
-  end
-
-  def compile(file, _defines = [])
-    compiler = build_compiler_fields
-    unity_include = $cfg['compiler']['includes']['prefix'] + '../../src'
-    cmd_str = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{unity_include} #{file} " \
-              "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}" \
-              "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
-
-    execute(cmd_str)
-  end
-
-  def build_linker_fields
-    command = tackit($cfg['linker']['path'])
-    options = if $cfg['linker']['options'].nil?
-                ''
-              else
-                squash('', $cfg['linker']['options'])
-              end
-    includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
-                 ''
-               else
-                 squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
-               end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, options: options, includes: includes }
-  end
-
-  def link_it(exe_name, obj_list)
-    linker = build_linker_fields
-    cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
-              (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
-              $cfg['linker']['bin_files']['prefix'] + ' ' +
-              $cfg['linker']['bin_files']['destination'] +
-              exe_name + $cfg['linker']['bin_files']['extension']
-    execute(cmd_str)
-  end
-
-  def build_simulator_fields
-    return nil if $cfg['simulator'].nil?
-    command = if $cfg['simulator']['path'].nil?
-                ''
-              else
-                (tackit($cfg['simulator']['path']) + ' ')
-              end
-    pre_support = if $cfg['simulator']['pre_support'].nil?
-                    ''
-                  else
-                    squash('', $cfg['simulator']['pre_support'])
-                  end
-    post_support = if $cfg['simulator']['post_support'].nil?
-                     ''
-                   else
-                     squash('', $cfg['simulator']['post_support'])
-                   end
-    { command: command, pre_support: pre_support, post_support: post_support }
-  end
-
-  def execute(command_string, verbose = true)
-    report command_string
-    output = `#{command_string}`.chomp
-    report(output) if verbose && !output.nil? && !output.empty?
-    raise "Command failed. (Returned #{$?.exitstatus})" if $?.exitstatus != 0
-    output
-  end
-
-  def report_summary
-    summary = UnityTestSummary.new
-    summary.root = __dir__
-    results_glob = "#{$cfg['compiler']['build_path']}*.test*"
-    results_glob.tr!('\\', '/')
-    results = Dir[results_glob]
-    summary.targets = results
-    summary.run
-  end
-
-  def run_tests
-    report 'Running Unity system tests...'
-
-    # Tack on TEST define for compiling unit tests
-    load_configuration($cfg_file)
-    test_defines = ['TEST']
-    $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
-
-    # Get a list of all source files needed
-    src_files  = Dir["#{__dir__}/src/*.c"]
-    src_files += Dir["#{__dir__}/test/*.c"]
-    src_files += Dir["#{__dir__}/test/main/*.c"]
-    src_files << '../../src/unity.c'
-
-    # Build object files
-    src_files.each { |f| compile(f, test_defines) }
-    obj_list = src_files.map { |f| File.basename(f.ext($cfg['compiler']['object_files']['extension'])) }
-
-    # Link the test executable
-    test_base = 'framework_test'
-    link_it(test_base, obj_list)
-
-    # Execute unit test and generate results file
-    simulator = build_simulator_fields
-    executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
-    cmd_str = if simulator.nil?
-                executable + ' -v -r'
-              else
-                "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
-              end
-    output = execute(cmd_str)
-    test_results = $cfg['compiler']['build_path'] + test_base
-    test_results += if output.match(/OK$/m).nil?
-                      '.testfail'
-                    else
-                      '.testpass'
-                    end
-    File.open(test_results, 'w') { |f| f.print output }
-  end
+  $cfg_file = "#{__dir__}/../../test/targets/#{config_file}" unless config_file =~ /[\\|\/]/
+  $cfg = YAML.load(File.read($cfg_file))
+  $colour_output = false unless $cfg['colour']
+  $configured = true if config_file != DEFAULT_CONFIG_FILE
+end
+
+def configure_clean
+  CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
+end
+
+def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
+  config_file += '.yml' unless config_file =~ /\.yml$/
+  config_file = config_file unless config_file =~ /[\\|\/]/
+  load_configuration(config_file)
+  configure_clean
+end
+
+def tackit(strings)
+  result = if strings.is_a?(Array)
+             "\"#{strings.join}\""
+           else
+             strings
+           end
+  result
+end
+
+def squash(prefix, items)
+  result = ''
+  items.each { |item| result += " #{prefix}#{tackit(item)}" }
+  result
+end
+
+def build_compiler_fields
+  command = tackit($cfg['compiler']['path'])
+  defines = if $cfg['compiler']['defines']['items'].nil?
+              ''
+            else
+              squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar'] + ['UNITY_OUTPUT_CHAR_HEADER_DECLARATION=UnityOutputCharSpy_OutputChar\(int\)'])
+            end
+  options = squash('', $cfg['compiler']['options'])
+  includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
+  includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
+
+  { command: command, defines: defines, options: options, includes: includes }
+end
+
+def compile(file, _defines = [])
+  compiler = build_compiler_fields
+  unity_include = $cfg['compiler']['includes']['prefix'] + '../../src'
+  cmd_str = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{unity_include} #{file} " \
+            "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}" \
+            "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
+
+  execute(cmd_str)
+end
+
+def build_linker_fields
+  command = tackit($cfg['linker']['path'])
+  options = if $cfg['linker']['options'].nil?
+              ''
+            else
+              squash('', $cfg['linker']['options'])
+            end
+  includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
+               ''
+             else
+               squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
+             end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
+
+  { command: command, options: options, includes: includes }
+end
+
+def link_it(exe_name, obj_list)
+  linker = build_linker_fields
+  cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
+            (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
+            $cfg['linker']['bin_files']['prefix'] + ' ' +
+            $cfg['linker']['bin_files']['destination'] +
+            exe_name + $cfg['linker']['bin_files']['extension']
+  execute(cmd_str)
+end
+
+def build_simulator_fields
+  return nil if $cfg['simulator'].nil?
+
+  command = if $cfg['simulator']['path'].nil?
+              ''
+            else
+              (tackit($cfg['simulator']['path']) + ' ')
+            end
+  pre_support = if $cfg['simulator']['pre_support'].nil?
+                  ''
+                else
+                  squash('', $cfg['simulator']['pre_support'])
+                end
+  post_support = if $cfg['simulator']['post_support'].nil?
+                   ''
+                 else
+                   squash('', $cfg['simulator']['post_support'])
+                 end
+  { command: command, pre_support: pre_support, post_support: post_support }
+end
+
+def execute(command_string, verbose = true)
+  report command_string
+  output = `#{command_string}`.chomp
+  report(output) if verbose && !output.nil? && !output.empty?
+
+  raise "Command failed. (Returned #{$?.exitstatus})" if $?.exitstatus != 0
+
+  output
+end
+
+def report_summary
+  summary = UnityTestSummary.new
+  summary.root = __dir__
+  results_glob = "#{$cfg['compiler']['build_path']}*.test*"
+  results_glob.tr!('\\', '/')
+  results = Dir[results_glob]
+  summary.targets = results
+  summary.run
+end
+
+def run_tests
+  report 'Running Unity system tests...'
+
+  # Tack on TEST define for compiling unit tests
+  load_configuration($cfg_file)
+  test_defines = ['TEST']
+  $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
+
+  # Get a list of all source files needed
+  src_files  = Dir["#{__dir__}/src/*.c"]
+  src_files += Dir["#{__dir__}/test/*.c"]
+  src_files += Dir["#{__dir__}/test/main/*.c"]
+  src_files << '../../src/unity.c'
+
+  # Build object files
+  src_files.each { |f| compile(f, test_defines) }
+  obj_list = src_files.map { |f| File.basename(f.ext($cfg['compiler']['object_files']['extension'])) }
+
+  # Link the test executable
+  test_base = 'framework_test'
+  link_it(test_base, obj_list)
+
+  # Execute unit test and generate results file
+  simulator = build_simulator_fields
+  executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
+  cmd_str = if simulator.nil?
+              executable + ' -v -r'
+            else
+              "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
+            end
+  output = execute(cmd_str)
+  test_results = $cfg['compiler']['build_path'] + test_base
+  test_results += if output.match(/OK$/m).nil?
+                    '.testfail'
+                  else
+                    '.testpass'
+                  end
+  File.open(test_results, 'w') { |f| f.print output }
 end
diff --git a/test/.rubocop.yml b/test/.rubocop.yml
index 3bfe31a..7c13076 100644
--- a/test/.rubocop.yml
+++ b/test/.rubocop.yml
@@ -3,7 +3,7 @@
 #inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
 
 # These are areas where ThrowTheSwitch's coding style diverges from the Ruby standard
 Style/SpecialGlobalVars:
@@ -12,10 +12,20 @@ Style/FormatString:
   Enabled: false
 Style/GlobalVars:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
 Style/RegexpLiteral:
   AllowInnerSlashes: true
 Style/HashSyntax:
   EnforcedStyle: no_mixed_keys
+Style/NumericPredicate:
+  Enabled: false
+
+# These are also places we diverge... but we will likely comply down the road
+Style/IfUnlessModifier:
+  Enabled: false
+Style/FormatStringToken:
+  Enabled: false
 
 # This is disabled because it seems to get confused over nested hashes
 Layout/AlignHash: