diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb
index c7d9a2b26162fbb8e0009715529c90bec4ad7e6a..01a868315a7b9928beae9c12f5db2bdbd32c9ab4 100644
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -10,7 +10,7 @@ File.expand_path(File.join(File.dirname(__FILE__),'colour_prompt'))
 class UnityTestRunnerGenerator
 
   def initialize(options = nil)
-    @options = self.default_options
+    @options = UnityTestRunnerGenerator.default_options
     case(options)
       when NilClass then @options
       when String   then @options.merge!(UnityTestRunnerGenerator.grab_config(options))
@@ -19,7 +19,7 @@ class UnityTestRunnerGenerator
     end
   end
 
-  def default_options
+  def self.default_options
     {
       :includes      => [],
       :plugins       => [],
@@ -31,7 +31,7 @@ class UnityTestRunnerGenerator
   end
 
   def self.grab_config(config_file)
-    options = default_options
+    options = self.default_options
     unless (config_file.nil? or config_file.empty?)
       require 'yaml'
       yaml_guts = YAML.load_file(config_file)
diff --git a/test/expectdata/testsample_cmd.c b/test/expectdata/testsample_cmd.c
index ffcd895e7b99e5ad5efbc70fdd7a6f7776915e23..989034487fc879fb66fb0effa197bdf1a2f10cfc 100644
--- a/test/expectdata/testsample_cmd.c
+++ b/test/expectdata/testsample_cmd.c
@@ -48,8 +48,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_def.c b/test/expectdata/testsample_def.c
index e2c9c6888f7a9b77c9339df665efd03961aa9714..f89b2568f2d8674f168ec423daf5b2003d6c683b 100644
--- a/test/expectdata/testsample_def.c
+++ b/test/expectdata/testsample_def.c
@@ -44,8 +44,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_mock_cmd.c b/test/expectdata/testsample_mock_cmd.c
index aa6137244fef514ab98f31d20416cb33051ad7d8..ed9fe99e1ca5a116e4f2a2b9a03f42237025aabd 100644
--- a/test/expectdata/testsample_mock_cmd.c
+++ b/test/expectdata/testsample_mock_cmd.c
@@ -69,8 +69,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_mock_def.c b/test/expectdata/testsample_mock_def.c
index 801b002d146cab1db7f356f332200b3b650890b3..be933b75bac88ae12d28b2d1da59e5a0164cd46b 100644
--- a/test/expectdata/testsample_mock_def.c
+++ b/test/expectdata/testsample_mock_def.c
@@ -65,8 +65,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_mock_new1.c b/test/expectdata/testsample_mock_new1.c
index 62f344f34299ab57e4ffdeab1d5c644becec6cc4..f6a8743b52c22d0bae1f01bb1cb86c121940fba8 100644
--- a/test/expectdata/testsample_mock_new1.c
+++ b/test/expectdata/testsample_mock_new1.c
@@ -78,8 +78,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_mock_new2.c b/test/expectdata/testsample_mock_new2.c
index e1216763a6af80b979a8d853107a9eafc18976ff..df816f7482edf13da46bb4b6aea3c9b5b7add0bc 100644
--- a/test/expectdata/testsample_mock_new2.c
+++ b/test/expectdata/testsample_mock_new2.c
@@ -78,8 +78,7 @@ void resetTest()
 int main(void)
 {
   suite_setup();
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_mock_param.c b/test/expectdata/testsample_mock_param.c
index 1ceb98fc379d5150e1932c9bcaf024f0cc30eee1..449779911d189f6d29edfd43452f3ad36eadc27a 100644
--- a/test/expectdata/testsample_mock_param.c
+++ b/test/expectdata/testsample_mock_param.c
@@ -66,8 +66,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
   RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
 
diff --git a/test/expectdata/testsample_mock_run1.c b/test/expectdata/testsample_mock_run1.c
index 62f344f34299ab57e4ffdeab1d5c644becec6cc4..f6a8743b52c22d0bae1f01bb1cb86c121940fba8 100644
--- a/test/expectdata/testsample_mock_run1.c
+++ b/test/expectdata/testsample_mock_run1.c
@@ -78,8 +78,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_mock_run2.c b/test/expectdata/testsample_mock_run2.c
index e1216763a6af80b979a8d853107a9eafc18976ff..df816f7482edf13da46bb4b6aea3c9b5b7add0bc 100644
--- a/test/expectdata/testsample_mock_run2.c
+++ b/test/expectdata/testsample_mock_run2.c
@@ -78,8 +78,7 @@ void resetTest()
 int main(void)
 {
   suite_setup();
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_mock_yaml.c b/test/expectdata/testsample_mock_yaml.c
index ad40188b59d0fc1e6e53105235163803ccbfbf15..e02b3c2530958f7878bd9769905837382336f6fb 100644
--- a/test/expectdata/testsample_mock_yaml.c
+++ b/test/expectdata/testsample_mock_yaml.c
@@ -79,8 +79,7 @@ void resetTest()
 int main(void)
 {
   suite_setup();
-  UnityBegin();
-  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin("testdata/mocksample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_new1.c b/test/expectdata/testsample_new1.c
index bc726e545e343cb5335174255786810b631d8b85..73bc4990279a386f82b788fab127f2bb6acd9dbc 100644
--- a/test/expectdata/testsample_new1.c
+++ b/test/expectdata/testsample_new1.c
@@ -54,8 +54,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_new2.c b/test/expectdata/testsample_new2.c
index 884af51bb6c3d38defdcf91010883401d55f41b5..5d66771e549938fff4f84338c1b6fd063872ed78 100644
--- a/test/expectdata/testsample_new2.c
+++ b/test/expectdata/testsample_new2.c
@@ -57,8 +57,7 @@ void resetTest()
 int main(void)
 {
   suite_setup();
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_param.c b/test/expectdata/testsample_param.c
index b287401360c4d749e0fb0d3356d335ab69d4947c..820ded239e58a4525ff307f0d7faeca68231462f 100644
--- a/test/expectdata/testsample_param.c
+++ b/test/expectdata/testsample_param.c
@@ -45,8 +45,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
   RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
 
diff --git a/test/expectdata/testsample_run1.c b/test/expectdata/testsample_run1.c
index bc726e545e343cb5335174255786810b631d8b85..73bc4990279a386f82b788fab127f2bb6acd9dbc 100644
--- a/test/expectdata/testsample_run1.c
+++ b/test/expectdata/testsample_run1.c
@@ -54,8 +54,7 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_run2.c b/test/expectdata/testsample_run2.c
index 884af51bb6c3d38defdcf91010883401d55f41b5..5d66771e549938fff4f84338c1b6fd063872ed78 100644
--- a/test/expectdata/testsample_run2.c
+++ b/test/expectdata/testsample_run2.c
@@ -57,8 +57,7 @@ void resetTest()
 int main(void)
 {
   suite_setup();
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/expectdata/testsample_yaml.c b/test/expectdata/testsample_yaml.c
index 75882a649518f982594b243f1a364867ec8216a6..0b38ad27d2d6aa89eb034995bb0b413afab09ab1 100644
--- a/test/expectdata/testsample_yaml.c
+++ b/test/expectdata/testsample_yaml.c
@@ -58,8 +58,7 @@ void resetTest()
 int main(void)
 {
   suite_setup();
-  UnityBegin();
-  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin("testdata/testsample.c");
   RUN_TEST(test_TheFirstThingToTest, 21);
   RUN_TEST(test_TheSecondThingToTest, 43);
 
diff --git a/test/rakefile b/test/rakefile
index b2af40edf6c877bed79ef6fc73077f2c28eeb32a..476d3ab4f2979bb3420a0b644f373c8242be1542 100644
--- a/test/rakefile
+++ b/test/rakefile
@@ -34,7 +34,7 @@ end
 
 desc "Test unity's helper scripts"
 task :scripts => [:prepare_for_tests] do
-  Dir['test/test_*.rb'].each do |scriptfile|
+  Dir['tests/test_*.rb'].each do |scriptfile|
     require "./"+scriptfile
   end
 end
diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb
index 8e0ace214dcc08c18c5a082dbf2876bae6f903cc..1f60f9877b7abf14ed9f51a22423b5d7f7392973 100644
--- a/test/tests/test_generate_test_runner.rb
+++ b/test/tests/test_generate_test_runner.rb
@@ -4,12 +4,12 @@
 #   [Released under MIT License. Please refer to license.txt for details]
 # ==========================================
 
-require './auto/generate_test_runner.rb'
+require '../auto/generate_test_runner.rb'
 
-TEST_FILE = 'test/testdata/testsample.c'
-TEST_MOCK = 'test/testdata/mocksample.c'
+TEST_FILE = 'testdata/testsample.c'
+TEST_MOCK = 'testdata/mocksample.c'
 OUT_FILE  = 'build/testsample_'
-EXP_FILE  = 'test/expectdata/testsample_'
+EXP_FILE  = 'expectdata/testsample_'
 
 $generate_test_runner_failures = 0
 
@@ -53,22 +53,22 @@ end
 
 should "GenerateARunnerByPullingYamlOptions" do
   subtest = 'yaml'
-  cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
+  cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
   `#{cmdstr}`
   verify_output_equal(subtest)
 
-  cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
+  cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
   `#{cmdstr}`
   verify_output_equal('mock_' + subtest)
 end
 
 should "GenerateARunnerByPullingCommandlineOptions" do
   subtest = 'cmd'
-  cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
+  cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
   `#{cmdstr}`
   verify_output_equal(subtest)
 
-  cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
+  cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
   `#{cmdstr}`
   verify_output_equal('mock_' + subtest)
 end