diff --git a/test/expectdata/testsample_cmd.c b/test/expectdata/testsample_cmd.c
index a014d9e24cb3655fe4c19f710fc01bf933efd871..d426dde4ba47212e919c1ec0222d0f36fe95578c 100644
--- a/test/expectdata/testsample_cmd.c
+++ b/test/expectdata/testsample_cmd.c
@@ -1,54 +1,57 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      setUp(); \
+      TestFunc(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_def.c b/test/expectdata/testsample_def.c
index 5c0bd3b324e440f71a42dc225d82a4f7d5064e86..8cdedde712a010c0209e74bcc4bff8ce1f7eecfb 100644
--- a/test/expectdata/testsample_def.c
+++ b/test/expectdata/testsample_def.c
@@ -1,50 +1,53 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_cmd.c b/test/expectdata/testsample_mock_cmd.c
index b571d735f40d8375486297f1f3cc5411b58f6f22..c62c3b5e6ff758619f5b5aa8e7c1e34209940fba 100644
--- a/test/expectdata/testsample_mock_cmd.c
+++ b/test/expectdata/testsample_mock_cmd.c
@@ -1,76 +1,78 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(); \
-      CMock_Verify(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "Mockstanky.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(); \
+      CMock_Verify(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_def.c b/test/expectdata/testsample_mock_def.c
index 54060ce732de18670e3a0e4be738cd11883e0e8b..e971179443f650066f1c152a685306fda78f4b64 100644
--- a/test/expectdata/testsample_mock_def.c
+++ b/test/expectdata/testsample_mock_def.c
@@ -1,72 +1,74 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(); \
-      CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "Mockstanky.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(); \
+      CMock_Verify(); \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_new1.c b/test/expectdata/testsample_mock_new1.c
index 161e6f7c7a106363389fdbf688b5e90b10376147..070927aaf31fcaf39734c02743c52fff45175a54 100644
--- a/test/expectdata/testsample_mock_new1.c
+++ b/test/expectdata/testsample_mock_new1.c
@@ -1,85 +1,87 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(); \
-      CMock_Verify(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include "one.h"
-#include "two.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "Mockstanky.h"
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  GlobalExpectCount = 0;
-  GlobalVerifyOrder = 0;
-  GlobalOrderError = NULL;
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(); \
+      CMock_Verify(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include "one.h"
+#include "two.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+int GlobalExpectCount;
+int GlobalVerifyOrder;
+char* GlobalOrderError;
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  GlobalExpectCount = 0;
+  GlobalVerifyOrder = 0;
+  GlobalOrderError = NULL;
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_new2.c b/test/expectdata/testsample_mock_new2.c
index dc44775d963c6d9695d74296ffbc69e04b77160c..6d786bae2f0051c07239697bb9aa884e7c6e72f7 100644
--- a/test/expectdata/testsample_mock_new2.c
+++ b/test/expectdata/testsample_mock_new2.c
@@ -1,85 +1,87 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(); \
-      CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "Mockstanky.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-//=======Suite Teardown=====
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return suite_teardown(UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(); \
+      CMock_Verify(); \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_custom_setup();
+}
+
+//=======Suite Teardown=====
+static int suite_teardown(int num_failures)
+{
+a_custom_teardown();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return suite_teardown(UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_param.c b/test/expectdata/testsample_mock_param.c
index 2f060372384aa8d6139679f9821137767129bda3..39f6c9184b76abf01625aa3d88da1f7fa72f4d91 100644
--- a/test/expectdata/testsample_mock_param.c
+++ b/test/expectdata/testsample_mock_param.c
@@ -1,73 +1,75 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST_NO_ARGS
-#define RUN_TEST(TestFunc, TestLineNum, ...) \
-{ \
-  Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(__VA_ARGS__); \
-      CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "Mockstanky.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
-  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST_NO_ARGS
+#define RUN_TEST(TestFunc, TestLineNum, ...) \
+{ \
+  Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(__VA_ARGS__); \
+      CMock_Verify(); \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
+  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_run1.c b/test/expectdata/testsample_mock_run1.c
index 161e6f7c7a106363389fdbf688b5e90b10376147..070927aaf31fcaf39734c02743c52fff45175a54 100644
--- a/test/expectdata/testsample_mock_run1.c
+++ b/test/expectdata/testsample_mock_run1.c
@@ -1,85 +1,87 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(); \
-      CMock_Verify(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include "one.h"
-#include "two.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "Mockstanky.h"
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  GlobalExpectCount = 0;
-  GlobalVerifyOrder = 0;
-  GlobalOrderError = NULL;
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(); \
+      CMock_Verify(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include "one.h"
+#include "two.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+int GlobalExpectCount;
+int GlobalVerifyOrder;
+char* GlobalOrderError;
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  GlobalExpectCount = 0;
+  GlobalVerifyOrder = 0;
+  GlobalOrderError = NULL;
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_run2.c b/test/expectdata/testsample_mock_run2.c
index dc44775d963c6d9695d74296ffbc69e04b77160c..6d786bae2f0051c07239697bb9aa884e7c6e72f7 100644
--- a/test/expectdata/testsample_mock_run2.c
+++ b/test/expectdata/testsample_mock_run2.c
@@ -1,85 +1,87 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(); \
-      CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "Mockstanky.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-//=======Suite Teardown=====
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return suite_teardown(UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(); \
+      CMock_Verify(); \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_custom_setup();
+}
+
+//=======Suite Teardown=====
+static int suite_teardown(int num_failures)
+{
+a_custom_teardown();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return suite_teardown(UnityEnd());
+}
diff --git a/test/expectdata/testsample_mock_yaml.c b/test/expectdata/testsample_mock_yaml.c
index 00c846c7b53d101da4de80d5af525b37ee56d39a..cf680fde1d893a639c5e7c8cf2b1445bf111e53f 100644
--- a/test/expectdata/testsample_mock_yaml.c
+++ b/test/expectdata/testsample_mock_yaml.c
@@ -1,86 +1,88 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      CMock_Init(); \
-      setUp(); \
-      TestFunc(); \
-      CMock_Verify(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  CMock_Destroy(); \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "cmock.h"
-#include "two.h"
-#include "three.h"
-#include <four.h>
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "Mockstanky.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Mock Management=====
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_yaml_setup();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/mocksample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      CMock_Init(); \
+      setUp(); \
+      TestFunc(); \
+      CMock_Verify(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  CMock_Destroy(); \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "cmock.h"
+#include "two.h"
+#include "three.h"
+#include <four.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include <setjmp.h>
+#include "Mockstanky.h"
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Mock Management=====
+static void CMock_Init(void)
+{
+  Mockstanky_Init();
+}
+static void CMock_Verify(void)
+{
+  Mockstanky_Verify();
+}
+static void CMock_Destroy(void)
+{
+  Mockstanky_Destroy();
+}
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_yaml_setup();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  CMock_Verify();
+  CMock_Destroy();
+  tearDown();
+  CMock_Init();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  Unity.TestFile = "test/testdata/mocksample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_new1.c b/test/expectdata/testsample_new1.c
index ce0922d7918084f6817a3fb18410235226695c6a..56b148bb710a582f2efe145c430d040d1b6c68d9 100644
--- a/test/expectdata/testsample_new1.c
+++ b/test/expectdata/testsample_new1.c
@@ -1,60 +1,63 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "one.h"
-#include "two.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      setUp(); \
+      TestFunc(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "one.h"
+#include "two.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+int GlobalExpectCount;
+int GlobalVerifyOrder;
+char* GlobalOrderError;
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_new2.c b/test/expectdata/testsample_new2.c
index fdbbef35db9a772033d44c4567236ee1f243e110..be591b3edab3668f79576b76fbc2fabe5e0c1cdf 100644
--- a/test/expectdata/testsample_new2.c
+++ b/test/expectdata/testsample_new2.c
@@ -1,63 +1,66 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-//=======Suite Teardown=====
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return suite_teardown(UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_custom_setup();
+}
+
+//=======Suite Teardown=====
+static int suite_teardown(int num_failures)
+{
+a_custom_teardown();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return suite_teardown(UnityEnd());
+}
diff --git a/test/expectdata/testsample_param.c b/test/expectdata/testsample_param.c
index 88658801af3b357a37a4b7d0b8792acc79608e9e..df4a69304c0bc53d8f0e2c18cb9141f885a9c0fc 100644
--- a/test/expectdata/testsample_param.c
+++ b/test/expectdata/testsample_param.c
@@ -1,51 +1,54 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST_NO_ARGS
-#define RUN_TEST(TestFunc, TestLineNum, ...) \
-{ \
-  Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(__VA_ARGS__); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
-  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST_NO_ARGS
+#define RUN_TEST(TestFunc, TestLineNum, ...) \
+{ \
+  Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(__VA_ARGS__); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
+  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_run1.c b/test/expectdata/testsample_run1.c
index ce0922d7918084f6817a3fb18410235226695c6a..56b148bb710a582f2efe145c430d040d1b6c68d9 100644
--- a/test/expectdata/testsample_run1.c
+++ b/test/expectdata/testsample_run1.c
@@ -1,60 +1,63 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "one.h"
-#include "two.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      setUp(); \
+      TestFunc(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "one.h"
+#include "two.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+int GlobalExpectCount;
+int GlobalVerifyOrder;
+char* GlobalOrderError;
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}
diff --git a/test/expectdata/testsample_run2.c b/test/expectdata/testsample_run2.c
index fdbbef35db9a772033d44c4567236ee1f243e110..be591b3edab3668f79576b76fbc2fabe5e0c1cdf 100644
--- a/test/expectdata/testsample_run2.c
+++ b/test/expectdata/testsample_run2.c
@@ -1,63 +1,66 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-//=======Suite Teardown=====
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return suite_teardown(UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_custom_setup();
+}
+
+//=======Suite Teardown=====
+static int suite_teardown(int num_failures)
+{
+a_custom_teardown();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return suite_teardown(UnityEnd());
+}
diff --git a/test/expectdata/testsample_yaml.c b/test/expectdata/testsample_yaml.c
index eb25bc99e4a4ae105040345622472f6e42fcfa8d..9198105a24c1fdab9b65d7bcd7c1ba86a3e7a56f 100644
--- a/test/expectdata/testsample_yaml.c
+++ b/test/expectdata/testsample_yaml.c
@@ -1,64 +1,67 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-//=======Test Runner Used To Run Each Test Below=====
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-//=======Automagically Detected Files To Include=====
-#include "unity.h"
-#include "two.h"
-#include "three.h"
-#include <four.h>
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-
-//=======External Functions This Runner Calls=====
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-//=======Suite Setup=====
-static int suite_setup(void)
-{
-a_yaml_setup();
-}
-
-//=======Test Reset Option=====
-void resetTest()
-{
-  tearDown();
-  setUp();
-}
-
-
-//=======MAIN=====
-int main(void)
-{
-  suite_setup();
-  Unity.TestFile = "test/testdata/testsample.c";
-  UnityBegin();
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  return (UnityEnd());
-}
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+    CEXCEPTION_T e; \
+    Try { \
+      setUp(); \
+      TestFunc(); \
+    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include "two.h"
+#include "three.h"
+#include <four.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include "CException.h"
+#include "funky.h"
+#include "stanky.h"
+#include <setjmp.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_TheFirstThingToTest(void);
+extern void test_TheSecondThingToTest(void);
+
+
+//=======Suite Setup=====
+static int suite_setup(void)
+{
+a_yaml_setup();
+}
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+
+//=======MAIN=====
+int main(void)
+{
+  suite_setup();
+  Unity.TestFile = "test/testdata/testsample.c";
+  UnityBegin();
+  RUN_TEST(test_TheFirstThingToTest, 21);
+  RUN_TEST(test_TheSecondThingToTest, 43);
+
+  return (UnityEnd());
+}