diff --git a/build/libs/web-api-commander.jar b/build/libs/web-api-commander.jar
index e9535e1..6385f49 100644
Binary files a/build/libs/web-api-commander.jar and b/build/libs/web-api-commander.jar differ
diff --git a/generic.gold.resoscript b/generic.gold.resoscript
index 7ae770e..1538bf2 100644
--- a/generic.gold.resoscript
+++ b/generic.gold.resoscript
@@ -44,7 +44,7 @@
   ############################################################-->
 
   <!-- The current version of this RESOScript -->
-  <RESOScriptVersion>2.0.1</RESOScriptVersion>
+  <RESOScriptVersion>2.0.2</RESOScriptVersion>
 
 
   <!--
@@ -73,7 +73,7 @@
     <BearerToken><!-- REQUIRED: Your BearerToken goes here if using Access Tokens --></BearerToken>
 
     <!-- Grant Type: client_credentials -->
-    <!-- <AuthenticationType>client_credentials</AuthenticationType>-->
+    <AuthenticationType>client_credentials</AuthenticationType>
     <ClientIdentification><!-- REQUIRED: Your client_id value if using Client Credentials--></ClientIdentification>
     <ClientSecret><!-- REQUIRED: Your client_secret value if using Client Credentials--></ClientSecret>
     <TokenURI><!-- REQUIRED: Your token endpoint URI--></TokenURI>
@@ -123,8 +123,8 @@
 
     <!-- REQUIRED: Core - Enumerated Field for Single-Value Testing -->
     <Parameter Name="SingleValueLookupField" Value="PropertyType" />
-    <Parameter Name="SingleLookupValue" Value="Residential" />
     <Parameter Name="SingleValueLookupNamespace" Value="PropertyEnums.PropertyType" />
+    <Parameter Name="SingleLookupValue" Value="Residential" />
 
     <!-- REQUIRED: Core - Enumerated Field for Multi-value testing -->
     <Parameter Name="MultipleValueLookupField" Value="Appliances" />
@@ -173,16 +173,9 @@
     <!-- REQUIRED: 400 Bad Request - Adjust to something that produces a 400 response if this doesn't work -->
     <Parameter Name="400BadRequest" Value="*Parameter_EndpointResource*?$filter=BadField eq 'SoBad'" />
 
-    <!-- REQUIRED: 403 Forbidden - Set this to a restricted resource for the given credentials -->
-    <Parameter Name="403Forbidden" Value="Teams" />
-
     <!-- REQUIRED: 404 Not Found - You shouldn't need to change this -->
     <Parameter Name="404NotFound" Value="ResourceNotFound" />
 
-    <!-- REQUIRED: 501 Not Implemented - Set this to an OData query that hasn't been implemented on your server -->
-    <Parameter Name="501NotImplemented" Value="*Parameter_EndpointResource*?$search=red OR blue" />
-
-
     <!--
     ############################################################
       Constants and Computed Values - Do Not Change
@@ -213,8 +206,8 @@
     <Parameter Name="MultipleValueLookupValue1" Value="*Parameter_MultipleValueLookupNamespace*'*Parameter_MultipleLookupValue1*'"/>
     <Parameter Name="MultipleValueLookupValue2" Value="*Parameter_MultipleValueLookupNamespace*'*Parameter_MultipleLookupValue2*'" />
 
-    <Parameter Name="OptionalMetadataFormatParameter" Value="?$format=application/xml" />
-
+    <!-- OPTIONAL: Useful for testing the OData Format Parameter - Value="?$format=application/xml" -->
+    <Parameter Name="OptionalMetadataFormatParameter" Value="" />
 
     <!--
     ############################################################
@@ -227,7 +220,6 @@
 
   </Parameters>
 
-
   <!--
   ############################################################
     Requests Section - Queries used during testing,
@@ -501,22 +493,11 @@
       Url="ClientSettings_WebAPIURI*/*Parameter_400BadRequest*"
     />
 
-    <Request
-      RequestId="REQ-WA103-RC06"
-      OutputFile="REQ-WA103-RC06_403Forbidden_Generic.json"
-      Url="ClientSettings_WebAPIURI*/*Parameter_403Forbidden*"
-    />
-
     <Request
       RequestId="REQ-WA103-RC07"
       OutputFile="REQ-WA103-RC07_404NotFound.json"
       Url="*ClientSettings_WebAPIURI*/*Parameter_404NotFound*"
     />
 
-    <Request
-      RequestId="REQ-WA103-RC11"
-      OutputFile="REQ-WA103-RC11_501NotImplemented.json"
-      Url="*ClientSettings_WebAPIURI*/*Parameter_501NotImplemented*"
-    />
   </Requests>
 </OutputScript>
\ No newline at end of file
diff --git a/generic.resoscript b/generic.resoscript
index 8e61871..31a40e6 100644
--- a/generic.resoscript
+++ b/generic.resoscript
@@ -44,7 +44,7 @@
   ############################################################-->
 
   <!-- The current version of this RESOScript -->
-  <RESOScriptVersion>2.0.1</RESOScriptVersion>
+  <RESOScriptVersion>2.0.2</RESOScriptVersion>
 
 
   <!--
@@ -73,7 +73,7 @@
     <BearerToken><!-- REQUIRED: Your BearerToken goes here if using Access Tokens --></BearerToken>
 
     <!-- Grant Type: client_credentials -->
-    <!-- <AuthenticationType>client_credentials</AuthenticationType>-->
+    <AuthenticationType>client_credentials</AuthenticationType>
     <ClientIdentification><!-- REQUIRED: Your client_id value if using Client Credentials--></ClientIdentification>
     <ClientSecret><!-- REQUIRED: Your client_secret value if using Client Credentials--></ClientSecret>
     <TokenURI><!-- REQUIRED: Your token endpoint URI--></TokenURI>
@@ -159,8 +159,6 @@
     <Parameter Name="ConcatFieldTwoValue" Value="YOUR TwoValue GOES HERE" />
     <Parameter Name="ConcatFieldBothValue" Value="Your OneValue: TwoValue GOES HERE" /> <!-- format: "OneValue: TwoValue" -->
 
-
-
     <!--
     ############################################################
       Sample Field Values
@@ -210,16 +208,9 @@
     <!-- REQUIRED: 400 Bad Request - Adjust to something that produces a 400 response if this doesn't work -->
     <Parameter Name="400BadRequest" Value="*Parameter_EndpointResource*?$filter=BadField eq 'SoBad'" />
 
-    <!-- REQUIRED: 403 Forbidden - Set this to a restricted resource for the given credentials -->
-    <Parameter Name="403Forbidden" Value="Teams" />
-
     <!-- REQUIRED: 404 Not Found - You shouldn't need to change this -->
     <Parameter Name="404NotFound" Value="ResourceNotFound" />
 
-    <!-- REQUIRED: 501 Not Implemented - Set this to an OData query that hasn't been implemented on your server -->
-    <Parameter Name="501NotImplemented" Value="*Parameter_EndpointResource*?$search=red OR blue" />
-
-
     <!--
     ############################################################
       Constants and Computed Values - Do Not Change
@@ -250,8 +241,8 @@
     <Parameter Name="MultipleValueLookupValue1" Value="*Parameter_MultipleValueLookupNamespace*'*Parameter_MultipleLookupValue1*'"/>
     <Parameter Name="MultipleValueLookupValue2" Value="*Parameter_MultipleValueLookupNamespace*'*Parameter_MultipleLookupValue2*'" />
 
-    <Parameter Name="OptionalMetadataFormatParameter" Value="?$format=application/xml" />
-
+    <!-- OPTIONAL: Useful for testing the OData Format Parameter - Value="?$format=application/xml" -->
+    <Parameter Name="OptionalMetadataFormatParameter" Value="" />
 
     <!--
     ############################################################
@@ -616,22 +607,11 @@
       Url="ClientSettings_WebAPIURI*/*Parameter_400BadRequest*"
     />
 
-    <Request
-      RequestId="REQ-WA103-RC06"
-      OutputFile="REQ-WA103-RC06_403Forbidden_Generic.json"
-      Url="ClientSettings_WebAPIURI*/*Parameter_403Forbidden*"
-    />
-
     <Request
       RequestId="REQ-WA103-RC07"
       OutputFile="REQ-WA103-RC07_404NotFound.json"
       Url="*ClientSettings_WebAPIURI*/*Parameter_404NotFound*"
     />
 
-    <Request
-      RequestId="REQ-WA103-RC11"
-      OutputFile="REQ-WA103-RC11_501NotImplemented.json"
-      Url="*ClientSettings_WebAPIURI*/*Parameter_501NotImplemented*"
-    />
   </Requests>
 </OutputScript>
diff --git a/src/main/java/org/reso/certification/features/web-api/web-api-server-1.0.2.feature b/src/main/java/org/reso/certification/features/web-api/web-api-server-1.0.2.feature
index b57bd0d..402c197 100644
--- a/src/main/java/org/reso/certification/features/web-api/web-api-server-1.0.2.feature
+++ b/src/main/java/org/reso/certification/features/web-api/web-api-server-1.0.2.feature
@@ -281,25 +281,12 @@ Feature: Web API Server 1.0.2 Certification
     Then the server responds with a status code of 400
     And the server has an OData-Version header value of "4.0" or "4.01"
 
-  @REQ-WA103-RC06 @core @2.5.2 @core-endorsement
-  Scenario: REQ-WA103-RC06 - 403 Forbidden Request
-    When a GET request is made to the resolved Url in "REQ-WA103-RC06"
-    Then the server responds with a status code of 403
-    And the server has an OData-Version header value of "4.0" or "4.01"
-
   @REQ-WA103-RC07 @core @2.5.2 @core-endorsement
   Scenario: REQ-WA103-RC07 - 404 Not Found Request
     When a GET request is made to the resolved Url in "REQ-WA103-RC07"
     Then the server responds with a status code of 404
     And the server has an OData-Version header value of "4.0" or "4.01"
 
-  @REQ-WA103-RC11 @core @2.5.2 @core-endorsement
-  Scenario: REQ-WA103-RC11 - 501 Not Implemented Request
-    When a GET request is made to the resolved Url in "REQ-WA103-RC11"
-    Then the server responds with a status code of 501
-    And the server has an OData-Version header value of "4.0" or "4.01"
-
-
   #######################################
   #  Bronze Tests
   #######################################