diff --git a/NUnitConsole.sln b/NUnitConsole.sln
index f6bd36ceb..f18bc0d9f 100644
--- a/NUnitConsole.sln
+++ b/NUnitConsole.sln
@@ -100,7 +100,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{9BCA00E2-D
 		cake\header-check.cake = cake\header-check.cake
 		cake\package-checks.cake = cake\package-checks.cake
 		cake\package-definitions.cake = cake\package-definitions.cake
-		cake\package-tests.cake = cake\package-tests.cake
 		cake\packages.cake = cake\packages.cake
 		cake\test-results.cake = cake\test-results.cake
 		cake\utilities.cake = cake\utilities.cake
diff --git a/build.cake b/build.cake
index b6daac062..cb27fa6c2 100644
--- a/build.cake
+++ b/build.cake
@@ -1,11 +1,10 @@
-static string Target; Target = GetArgument("target|t", "Default");
+static string Target; Target = Argument("target", Argument("t", "Default"));
 
 #load cake/constants.cake
 #load cake/build-settings.cake
 #load cake/header-check.cake
 #load cake/package-checks.cake
 #load cake/test-results.cake
-#load cake/package-tests.cake
 #load cake/versioning.cake
 #load cake/utilities.cake
 #load cake/package-definitions.cake
diff --git a/cake/build-settings.cake b/cake/build-settings.cake
index 1bbfc83dd..f35d83449 100644
--- a/cake/build-settings.cake
+++ b/cake/build-settings.cake
@@ -14,7 +14,7 @@ public class BuildSettings
         Target = context.TargetTask.Name;
         TasksToExecute = context.TasksToExecute.Select(t => t.Name);
 
-        Configuration = context.Argument("configuration", "Release");
+        Configuration = context.Argument("configuration", context.Argument("c", "Release"));
         NoPush = context.HasArgument("nopush");
 
         BuildVersion = new BuildVersion(context);
diff --git a/cake/package-definitions.cake b/cake/package-definitions.cake
index c90f41732..17193bcff 100644
--- a/cake/package-definitions.cake
+++ b/cake/package-definitions.cake
@@ -1,3 +1,23 @@
+//////////////////////////////////////////////////////////////////////
+// PACKAGE TEST STRUCTURE
+//////////////////////////////////////////////////////////////////////
+
+public struct PackageTest
+{
+    public string Name;
+    public string Description;
+    public string Arguments;
+    public ExpectedResult ExpectedResult;
+
+    public PackageTest(string name, string description, string arguments, ExpectedResult expectedResult)
+    {
+        Name = name;
+        Description = description;
+        Arguments = arguments;
+        ExpectedResult = expectedResult;
+    }
+}
+
 //////////////////////////////////////////////////////////////////////
 // PACKAGE DEFINITION ABSTRACT CLASS
 //////////////////////////////////////////////////////////////////////
diff --git a/cake/package-tests.cake b/cake/package-tests.cake
deleted file mode 100644
index 03b8c8304..000000000
--- a/cake/package-tests.cake
+++ /dev/null
@@ -1,17 +0,0 @@
-// Representation of a single test to be run against a pre-built package.
-public struct PackageTest
-{
-    public string Name;
-    public string Description;
-    public string Arguments;
-    public ExpectedResult ExpectedResult;
-
-    public PackageTest(string name, string description, string arguments, ExpectedResult expectedResult)
-    {
-        Name = name;
-        Description = description;
-        Arguments = arguments;
-        ExpectedResult = expectedResult;
-    }
-}
-
diff --git a/cake/utilities.cake b/cake/utilities.cake
index c2c7faaa7..d6559d266 100644
--- a/cake/utilities.cake
+++ b/cake/utilities.cake
@@ -2,15 +2,6 @@
 // HELPER METHODS - GENERAL
 //////////////////////////////////////////////////////////////////////
 
-T GetArgument<T>(string pattern, T defaultValue)
-{
-    foreach (string name in pattern.Split('|'))
-        if (HasArgument(name))
-            return Argument<T>(name);
-
-    return defaultValue;
-}
-
 bool CheckIfDotNetCoreInstalled()
 {
     try