diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.2.0.1`
+`1.2.0.2`
 
 
 ## Description
diff --git a/amazonka-ec2.cabal b/amazonka-ec2.cabal
--- a/amazonka-ec2.cabal
+++ b/amazonka-ec2.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-ec2
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Elastic Compute Cloud SDK.
 homepage:              https://github.com/brendanhay/amazonka
+bug-reports:           https://github.com/brendanhay/amazonka/issues
 license:               OtherLicense
 license-file:          LICENSE
 author:                Brendan Hay
@@ -9,9 +10,8 @@
 copyright:             Copyright (c) 2013-2015 Brendan Hay
 category:              Network, AWS, Cloud, Distributed Computing
 build-type:            Simple
-extra-source-files:    README.md
 cabal-version:         >= 1.10
-
+extra-source-files:    README.md fixture/*.yaml fixture/*.proto
 description:
     Amazon Elastic Compute Cloud
 
@@ -247,8 +247,9 @@
 
     ghc-options:       -Wall -threaded
 
-    -- This is not comprehensive if modules have manually been added.
-    -- It exists to ensure cabal 'somewhat' detects test module changes.
+    -- This section is encoded by the template and any modules added by
+    -- hand outside these namespaces will not correctly be added to the
+    -- distribution package.
     other-modules:
           Test.AWS.EC2
         , Test.AWS.Gen.EC2
diff --git a/fixture/AcceptVPCPeeringConnection.yaml b/fixture/AcceptVPCPeeringConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AcceptVPCPeeringConnection.yaml
diff --git a/fixture/AcceptVPCPeeringConnectionResponse.proto b/fixture/AcceptVPCPeeringConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AcceptVPCPeeringConnectionResponse.proto
diff --git a/fixture/AllocateAddress.yaml b/fixture/AllocateAddress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AllocateAddress.yaml
diff --git a/fixture/AllocateAddressResponse.proto b/fixture/AllocateAddressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AllocateAddressResponse.proto
diff --git a/fixture/AssignPrivateIPAddresses.yaml b/fixture/AssignPrivateIPAddresses.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AssignPrivateIPAddresses.yaml
diff --git a/fixture/AssignPrivateIPAddressesResponse.proto b/fixture/AssignPrivateIPAddressesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AssignPrivateIPAddressesResponse.proto
diff --git a/fixture/AssociateAddress.yaml b/fixture/AssociateAddress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AssociateAddress.yaml
diff --git a/fixture/AssociateAddressResponse.proto b/fixture/AssociateAddressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AssociateAddressResponse.proto
diff --git a/fixture/AssociateDHCPOptions.yaml b/fixture/AssociateDHCPOptions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AssociateDHCPOptions.yaml
diff --git a/fixture/AssociateDHCPOptionsResponse.proto b/fixture/AssociateDHCPOptionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AssociateDHCPOptionsResponse.proto
diff --git a/fixture/AssociateRouteTable.yaml b/fixture/AssociateRouteTable.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AssociateRouteTable.yaml
diff --git a/fixture/AssociateRouteTableResponse.proto b/fixture/AssociateRouteTableResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AssociateRouteTableResponse.proto
diff --git a/fixture/AttachClassicLinkVPC.yaml b/fixture/AttachClassicLinkVPC.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AttachClassicLinkVPC.yaml
diff --git a/fixture/AttachClassicLinkVPCResponse.proto b/fixture/AttachClassicLinkVPCResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AttachClassicLinkVPCResponse.proto
diff --git a/fixture/AttachInternetGateway.yaml b/fixture/AttachInternetGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AttachInternetGateway.yaml
diff --git a/fixture/AttachInternetGatewayResponse.proto b/fixture/AttachInternetGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AttachInternetGatewayResponse.proto
diff --git a/fixture/AttachNetworkInterface.yaml b/fixture/AttachNetworkInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AttachNetworkInterface.yaml
diff --git a/fixture/AttachNetworkInterfaceResponse.proto b/fixture/AttachNetworkInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AttachNetworkInterfaceResponse.proto
diff --git a/fixture/AttachVPNGateway.yaml b/fixture/AttachVPNGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AttachVPNGateway.yaml
diff --git a/fixture/AttachVPNGatewayResponse.proto b/fixture/AttachVPNGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AttachVPNGatewayResponse.proto
diff --git a/fixture/AttachVolume.yaml b/fixture/AttachVolume.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AttachVolume.yaml
diff --git a/fixture/AttachVolumeResponse.proto b/fixture/AttachVolumeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AttachVolumeResponse.proto
diff --git a/fixture/AuthorizeSecurityGroupEgress.yaml b/fixture/AuthorizeSecurityGroupEgress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeSecurityGroupEgress.yaml
diff --git a/fixture/AuthorizeSecurityGroupEgressResponse.proto b/fixture/AuthorizeSecurityGroupEgressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeSecurityGroupEgressResponse.proto
diff --git a/fixture/AuthorizeSecurityGroupIngress.yaml b/fixture/AuthorizeSecurityGroupIngress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeSecurityGroupIngress.yaml
diff --git a/fixture/AuthorizeSecurityGroupIngressResponse.proto b/fixture/AuthorizeSecurityGroupIngressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AuthorizeSecurityGroupIngressResponse.proto
diff --git a/fixture/BundleInstance.yaml b/fixture/BundleInstance.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/BundleInstance.yaml
diff --git a/fixture/BundleInstanceResponse.proto b/fixture/BundleInstanceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/BundleInstanceResponse.proto
diff --git a/fixture/CancelBundleTask.yaml b/fixture/CancelBundleTask.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelBundleTask.yaml
diff --git a/fixture/CancelBundleTaskResponse.proto b/fixture/CancelBundleTaskResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelBundleTaskResponse.proto
diff --git a/fixture/CancelConversionTask.yaml b/fixture/CancelConversionTask.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelConversionTask.yaml
diff --git a/fixture/CancelConversionTaskResponse.proto b/fixture/CancelConversionTaskResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelConversionTaskResponse.proto
diff --git a/fixture/CancelExportTask.yaml b/fixture/CancelExportTask.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelExportTask.yaml
diff --git a/fixture/CancelExportTaskResponse.proto b/fixture/CancelExportTaskResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelExportTaskResponse.proto
diff --git a/fixture/CancelImportTask.yaml b/fixture/CancelImportTask.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelImportTask.yaml
diff --git a/fixture/CancelImportTaskResponse.proto b/fixture/CancelImportTaskResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelImportTaskResponse.proto
diff --git a/fixture/CancelReservedInstancesListing.yaml b/fixture/CancelReservedInstancesListing.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelReservedInstancesListing.yaml
diff --git a/fixture/CancelReservedInstancesListingResponse.proto b/fixture/CancelReservedInstancesListingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelReservedInstancesListingResponse.proto
diff --git a/fixture/CancelSpotFleetRequests.yaml b/fixture/CancelSpotFleetRequests.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelSpotFleetRequests.yaml
diff --git a/fixture/CancelSpotFleetRequestsResponse.proto b/fixture/CancelSpotFleetRequestsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelSpotFleetRequestsResponse.proto
diff --git a/fixture/CancelSpotInstanceRequests.yaml b/fixture/CancelSpotInstanceRequests.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelSpotInstanceRequests.yaml
diff --git a/fixture/CancelSpotInstanceRequestsResponse.proto b/fixture/CancelSpotInstanceRequestsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelSpotInstanceRequestsResponse.proto
diff --git a/fixture/ConfirmProductInstance.yaml b/fixture/ConfirmProductInstance.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmProductInstance.yaml
diff --git a/fixture/ConfirmProductInstanceResponse.proto b/fixture/ConfirmProductInstanceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ConfirmProductInstanceResponse.proto
diff --git a/fixture/CopyImage.yaml b/fixture/CopyImage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CopyImage.yaml
diff --git a/fixture/CopyImageResponse.proto b/fixture/CopyImageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CopyImageResponse.proto
diff --git a/fixture/CopySnapshot.yaml b/fixture/CopySnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CopySnapshot.yaml
@@ -0,0 +1,10 @@
+---
+method: POST
+headers:
+  Authorization:         AWS4-HMAC-SHA256 Credential=access/20091028/us-east-1/ec2/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=e621369ae218882689c2913155ab7b8a7bcc83d22c2970f68566729e49f6ebbb
+  Host:                  ec2.us-east-1.amazonaws.com
+  Content-Type:          application/x-www-form-urlencoded; charset=utf-8
+  X-Amz-Content-SHA256:  f86f1bedddd8ce442b987eff0b4d2144bd04df54b6c2b4e057684e83cb3a7018
+  X-Amz-Date:            20091028T223200Z
+body:
+  Action=CopySnapshot&Description=My_snapshot&SourceRegion=us-west-1&SourceSnapshotId=snap-1a2b3c4d&Version=2015-04-15
diff --git a/fixture/CopySnapshotResponse.proto b/fixture/CopySnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CopySnapshotResponse.proto
diff --git a/fixture/CreateCustomerGateway.yaml b/fixture/CreateCustomerGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCustomerGateway.yaml
diff --git a/fixture/CreateCustomerGatewayResponse.proto b/fixture/CreateCustomerGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCustomerGatewayResponse.proto
diff --git a/fixture/CreateDHCPOptions.yaml b/fixture/CreateDHCPOptions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateDHCPOptions.yaml
diff --git a/fixture/CreateDHCPOptionsResponse.proto b/fixture/CreateDHCPOptionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateDHCPOptionsResponse.proto
diff --git a/fixture/CreateFlowLogs.yaml b/fixture/CreateFlowLogs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateFlowLogs.yaml
diff --git a/fixture/CreateFlowLogsResponse.proto b/fixture/CreateFlowLogsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateFlowLogsResponse.proto
diff --git a/fixture/CreateImage.yaml b/fixture/CreateImage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateImage.yaml
diff --git a/fixture/CreateImageResponse.proto b/fixture/CreateImageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateImageResponse.proto
diff --git a/fixture/CreateInstanceExportTask.yaml b/fixture/CreateInstanceExportTask.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateInstanceExportTask.yaml
diff --git a/fixture/CreateInstanceExportTaskResponse.proto b/fixture/CreateInstanceExportTaskResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateInstanceExportTaskResponse.proto
diff --git a/fixture/CreateInternetGateway.yaml b/fixture/CreateInternetGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateInternetGateway.yaml
diff --git a/fixture/CreateInternetGatewayResponse.proto b/fixture/CreateInternetGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateInternetGatewayResponse.proto
diff --git a/fixture/CreateKeyPair.yaml b/fixture/CreateKeyPair.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateKeyPair.yaml
diff --git a/fixture/CreateKeyPairResponse.proto b/fixture/CreateKeyPairResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateKeyPairResponse.proto
diff --git a/fixture/CreateNetworkACL.yaml b/fixture/CreateNetworkACL.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateNetworkACL.yaml
diff --git a/fixture/CreateNetworkACLEntry.yaml b/fixture/CreateNetworkACLEntry.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateNetworkACLEntry.yaml
diff --git a/fixture/CreateNetworkACLEntryResponse.proto b/fixture/CreateNetworkACLEntryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateNetworkACLEntryResponse.proto
diff --git a/fixture/CreateNetworkACLResponse.proto b/fixture/CreateNetworkACLResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateNetworkACLResponse.proto
diff --git a/fixture/CreateNetworkInterface.yaml b/fixture/CreateNetworkInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateNetworkInterface.yaml
diff --git a/fixture/CreateNetworkInterfaceResponse.proto b/fixture/CreateNetworkInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateNetworkInterfaceResponse.proto
diff --git a/fixture/CreatePlacementGroup.yaml b/fixture/CreatePlacementGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePlacementGroup.yaml
diff --git a/fixture/CreatePlacementGroupResponse.proto b/fixture/CreatePlacementGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreatePlacementGroupResponse.proto
diff --git a/fixture/CreateReservedInstancesListing.yaml b/fixture/CreateReservedInstancesListing.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateReservedInstancesListing.yaml
diff --git a/fixture/CreateReservedInstancesListingResponse.proto b/fixture/CreateReservedInstancesListingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateReservedInstancesListingResponse.proto
diff --git a/fixture/CreateRoute.yaml b/fixture/CreateRoute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateRoute.yaml
diff --git a/fixture/CreateRouteResponse.proto b/fixture/CreateRouteResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateRouteResponse.proto
diff --git a/fixture/CreateRouteTable.yaml b/fixture/CreateRouteTable.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateRouteTable.yaml
diff --git a/fixture/CreateRouteTableResponse.proto b/fixture/CreateRouteTableResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateRouteTableResponse.proto
diff --git a/fixture/CreateSecurityGroup.yaml b/fixture/CreateSecurityGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSecurityGroup.yaml
diff --git a/fixture/CreateSecurityGroupResponse.proto b/fixture/CreateSecurityGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSecurityGroupResponse.proto
diff --git a/fixture/CreateSnapshot.yaml b/fixture/CreateSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshot.yaml
diff --git a/fixture/CreateSnapshotResponse.proto b/fixture/CreateSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotResponse.proto
diff --git a/fixture/CreateSpotDatafeedSubscription.yaml b/fixture/CreateSpotDatafeedSubscription.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSpotDatafeedSubscription.yaml
diff --git a/fixture/CreateSpotDatafeedSubscriptionResponse.proto b/fixture/CreateSpotDatafeedSubscriptionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSpotDatafeedSubscriptionResponse.proto
diff --git a/fixture/CreateSubnet.yaml b/fixture/CreateSubnet.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSubnet.yaml
diff --git a/fixture/CreateSubnetResponse.proto b/fixture/CreateSubnetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSubnetResponse.proto
diff --git a/fixture/CreateTags.yaml b/fixture/CreateTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTags.yaml
diff --git a/fixture/CreateTagsResponse.proto b/fixture/CreateTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTagsResponse.proto
diff --git a/fixture/CreateVPC.yaml b/fixture/CreateVPC.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPC.yaml
diff --git a/fixture/CreateVPCEndpoint.yaml b/fixture/CreateVPCEndpoint.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPCEndpoint.yaml
diff --git a/fixture/CreateVPCEndpointResponse.proto b/fixture/CreateVPCEndpointResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPCEndpointResponse.proto
diff --git a/fixture/CreateVPCPeeringConnection.yaml b/fixture/CreateVPCPeeringConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPCPeeringConnection.yaml
diff --git a/fixture/CreateVPCPeeringConnectionResponse.proto b/fixture/CreateVPCPeeringConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPCPeeringConnectionResponse.proto
diff --git a/fixture/CreateVPCResponse.proto b/fixture/CreateVPCResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPCResponse.proto
diff --git a/fixture/CreateVPNConnection.yaml b/fixture/CreateVPNConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPNConnection.yaml
diff --git a/fixture/CreateVPNConnectionResponse.proto b/fixture/CreateVPNConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPNConnectionResponse.proto
diff --git a/fixture/CreateVPNConnectionRoute.yaml b/fixture/CreateVPNConnectionRoute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPNConnectionRoute.yaml
diff --git a/fixture/CreateVPNConnectionRouteResponse.proto b/fixture/CreateVPNConnectionRouteResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPNConnectionRouteResponse.proto
diff --git a/fixture/CreateVPNGateway.yaml b/fixture/CreateVPNGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPNGateway.yaml
diff --git a/fixture/CreateVPNGatewayResponse.proto b/fixture/CreateVPNGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVPNGatewayResponse.proto
diff --git a/fixture/CreateVolume.yaml b/fixture/CreateVolume.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVolume.yaml
diff --git a/fixture/CreateVolumeResponse.proto b/fixture/CreateVolumeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateVolumeResponse.proto
diff --git a/fixture/DeleteCustomerGateway.yaml b/fixture/DeleteCustomerGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCustomerGateway.yaml
diff --git a/fixture/DeleteCustomerGatewayResponse.proto b/fixture/DeleteCustomerGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteCustomerGatewayResponse.proto
diff --git a/fixture/DeleteDHCPOptions.yaml b/fixture/DeleteDHCPOptions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDHCPOptions.yaml
diff --git a/fixture/DeleteDHCPOptionsResponse.proto b/fixture/DeleteDHCPOptionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteDHCPOptionsResponse.proto
diff --git a/fixture/DeleteFlowLogs.yaml b/fixture/DeleteFlowLogs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteFlowLogs.yaml
diff --git a/fixture/DeleteFlowLogsResponse.proto b/fixture/DeleteFlowLogsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteFlowLogsResponse.proto
diff --git a/fixture/DeleteInternetGateway.yaml b/fixture/DeleteInternetGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteInternetGateway.yaml
diff --git a/fixture/DeleteInternetGatewayResponse.proto b/fixture/DeleteInternetGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteInternetGatewayResponse.proto
diff --git a/fixture/DeleteKeyPair.yaml b/fixture/DeleteKeyPair.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteKeyPair.yaml
diff --git a/fixture/DeleteKeyPairResponse.proto b/fixture/DeleteKeyPairResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteKeyPairResponse.proto
diff --git a/fixture/DeleteNetworkACL.yaml b/fixture/DeleteNetworkACL.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteNetworkACL.yaml
diff --git a/fixture/DeleteNetworkACLEntry.yaml b/fixture/DeleteNetworkACLEntry.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteNetworkACLEntry.yaml
diff --git a/fixture/DeleteNetworkACLEntryResponse.proto b/fixture/DeleteNetworkACLEntryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteNetworkACLEntryResponse.proto
diff --git a/fixture/DeleteNetworkACLResponse.proto b/fixture/DeleteNetworkACLResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteNetworkACLResponse.proto
diff --git a/fixture/DeleteNetworkInterface.yaml b/fixture/DeleteNetworkInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteNetworkInterface.yaml
diff --git a/fixture/DeleteNetworkInterfaceResponse.proto b/fixture/DeleteNetworkInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteNetworkInterfaceResponse.proto
diff --git a/fixture/DeletePlacementGroup.yaml b/fixture/DeletePlacementGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeletePlacementGroup.yaml
diff --git a/fixture/DeletePlacementGroupResponse.proto b/fixture/DeletePlacementGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeletePlacementGroupResponse.proto
diff --git a/fixture/DeleteRoute.yaml b/fixture/DeleteRoute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteRoute.yaml
diff --git a/fixture/DeleteRouteResponse.proto b/fixture/DeleteRouteResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteRouteResponse.proto
diff --git a/fixture/DeleteRouteTable.yaml b/fixture/DeleteRouteTable.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteRouteTable.yaml
diff --git a/fixture/DeleteRouteTableResponse.proto b/fixture/DeleteRouteTableResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteRouteTableResponse.proto
diff --git a/fixture/DeleteSecurityGroup.yaml b/fixture/DeleteSecurityGroup.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSecurityGroup.yaml
diff --git a/fixture/DeleteSecurityGroupResponse.proto b/fixture/DeleteSecurityGroupResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSecurityGroupResponse.proto
diff --git a/fixture/DeleteSnapshot.yaml b/fixture/DeleteSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshot.yaml
diff --git a/fixture/DeleteSnapshotResponse.proto b/fixture/DeleteSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshotResponse.proto
diff --git a/fixture/DeleteSpotDatafeedSubscription.yaml b/fixture/DeleteSpotDatafeedSubscription.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSpotDatafeedSubscription.yaml
diff --git a/fixture/DeleteSpotDatafeedSubscriptionResponse.proto b/fixture/DeleteSpotDatafeedSubscriptionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSpotDatafeedSubscriptionResponse.proto
diff --git a/fixture/DeleteSubnet.yaml b/fixture/DeleteSubnet.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSubnet.yaml
diff --git a/fixture/DeleteSubnetResponse.proto b/fixture/DeleteSubnetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSubnetResponse.proto
diff --git a/fixture/DeleteTags.yaml b/fixture/DeleteTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTags.yaml
diff --git a/fixture/DeleteTagsResponse.proto b/fixture/DeleteTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTagsResponse.proto
diff --git a/fixture/DeleteVPC.yaml b/fixture/DeleteVPC.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPC.yaml
diff --git a/fixture/DeleteVPCEndpoints.yaml b/fixture/DeleteVPCEndpoints.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPCEndpoints.yaml
diff --git a/fixture/DeleteVPCEndpointsResponse.proto b/fixture/DeleteVPCEndpointsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPCEndpointsResponse.proto
diff --git a/fixture/DeleteVPCPeeringConnection.yaml b/fixture/DeleteVPCPeeringConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPCPeeringConnection.yaml
diff --git a/fixture/DeleteVPCPeeringConnectionResponse.proto b/fixture/DeleteVPCPeeringConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPCPeeringConnectionResponse.proto
diff --git a/fixture/DeleteVPCResponse.proto b/fixture/DeleteVPCResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPCResponse.proto
diff --git a/fixture/DeleteVPNConnection.yaml b/fixture/DeleteVPNConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPNConnection.yaml
diff --git a/fixture/DeleteVPNConnectionResponse.proto b/fixture/DeleteVPNConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPNConnectionResponse.proto
diff --git a/fixture/DeleteVPNConnectionRoute.yaml b/fixture/DeleteVPNConnectionRoute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPNConnectionRoute.yaml
diff --git a/fixture/DeleteVPNConnectionRouteResponse.proto b/fixture/DeleteVPNConnectionRouteResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPNConnectionRouteResponse.proto
diff --git a/fixture/DeleteVPNGateway.yaml b/fixture/DeleteVPNGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPNGateway.yaml
diff --git a/fixture/DeleteVPNGatewayResponse.proto b/fixture/DeleteVPNGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVPNGatewayResponse.proto
diff --git a/fixture/DeleteVolume.yaml b/fixture/DeleteVolume.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVolume.yaml
diff --git a/fixture/DeleteVolumeResponse.proto b/fixture/DeleteVolumeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteVolumeResponse.proto
diff --git a/fixture/DeregisterImage.yaml b/fixture/DeregisterImage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeregisterImage.yaml
diff --git a/fixture/DeregisterImageResponse.proto b/fixture/DeregisterImageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeregisterImageResponse.proto
diff --git a/fixture/DescribeAccountAttributes.yaml b/fixture/DescribeAccountAttributes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAccountAttributes.yaml
diff --git a/fixture/DescribeAccountAttributesResponse.proto b/fixture/DescribeAccountAttributesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAccountAttributesResponse.proto
diff --git a/fixture/DescribeAddresses.yaml b/fixture/DescribeAddresses.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAddresses.yaml
diff --git a/fixture/DescribeAddressesResponse.proto b/fixture/DescribeAddressesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAddressesResponse.proto
diff --git a/fixture/DescribeAvailabilityZones.yaml b/fixture/DescribeAvailabilityZones.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAvailabilityZones.yaml
diff --git a/fixture/DescribeAvailabilityZonesResponse.proto b/fixture/DescribeAvailabilityZonesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeAvailabilityZonesResponse.proto
diff --git a/fixture/DescribeBundleTasks.yaml b/fixture/DescribeBundleTasks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeBundleTasks.yaml
diff --git a/fixture/DescribeBundleTasksResponse.proto b/fixture/DescribeBundleTasksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeBundleTasksResponse.proto
diff --git a/fixture/DescribeClassicLinkInstances.yaml b/fixture/DescribeClassicLinkInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClassicLinkInstances.yaml
diff --git a/fixture/DescribeClassicLinkInstancesResponse.proto b/fixture/DescribeClassicLinkInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeClassicLinkInstancesResponse.proto
diff --git a/fixture/DescribeConversionTasks.yaml b/fixture/DescribeConversionTasks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConversionTasks.yaml
diff --git a/fixture/DescribeConversionTasksResponse.proto b/fixture/DescribeConversionTasksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeConversionTasksResponse.proto
diff --git a/fixture/DescribeCustomerGateways.yaml b/fixture/DescribeCustomerGateways.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCustomerGateways.yaml
diff --git a/fixture/DescribeCustomerGatewaysResponse.proto b/fixture/DescribeCustomerGatewaysResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCustomerGatewaysResponse.proto
diff --git a/fixture/DescribeDHCPOptions.yaml b/fixture/DescribeDHCPOptions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDHCPOptions.yaml
diff --git a/fixture/DescribeDHCPOptionsResponse.proto b/fixture/DescribeDHCPOptionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeDHCPOptionsResponse.proto
diff --git a/fixture/DescribeExportTasks.yaml b/fixture/DescribeExportTasks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeExportTasks.yaml
diff --git a/fixture/DescribeExportTasksResponse.proto b/fixture/DescribeExportTasksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeExportTasksResponse.proto
diff --git a/fixture/DescribeFlowLogs.yaml b/fixture/DescribeFlowLogs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeFlowLogs.yaml
diff --git a/fixture/DescribeFlowLogsResponse.proto b/fixture/DescribeFlowLogsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeFlowLogsResponse.proto
diff --git a/fixture/DescribeImageAttribute.yaml b/fixture/DescribeImageAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImageAttribute.yaml
diff --git a/fixture/DescribeImageAttributeResponse.proto b/fixture/DescribeImageAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImageAttributeResponse.proto
diff --git a/fixture/DescribeImages.yaml b/fixture/DescribeImages.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImages.yaml
@@ -0,0 +1,10 @@
+---
+method: POST
+headers:
+  Authorization:         AWS4-HMAC-SHA256 Credential=access/20091028/us-east-1/ec2/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=703971f74f0e6477389f0f0573ffca8f6cc149858b3e64a5ad7b1e68234c3b53
+  Host:                  ec2.us-east-1.amazonaws.com
+  Content-Type:          application/x-www-form-urlencoded; charset=utf-8
+  X-Amz-Content-SHA256:  856e4442dce881de9a90f3b5f6d2c7984d9756b8285e0eb558af0c0ed25ab8c7
+  X-Amz-Date:            20091028T223200Z
+body:
+  Action=DescribeImages&Filter.1.Name=is-public&Filter.1.Value.1=true&Filter.2.Name=architecture&Filter.2.Value.1=x86_64&Filter.3.Name=platform&Filter.3.Value.1=windows&Version=2015-04-15
diff --git a/fixture/DescribeImagesResponse.proto b/fixture/DescribeImagesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImagesResponse.proto
diff --git a/fixture/DescribeImportImageTasks.yaml b/fixture/DescribeImportImageTasks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImportImageTasks.yaml
diff --git a/fixture/DescribeImportImageTasksResponse.proto b/fixture/DescribeImportImageTasksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImportImageTasksResponse.proto
diff --git a/fixture/DescribeImportSnapshotTasks.yaml b/fixture/DescribeImportSnapshotTasks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImportSnapshotTasks.yaml
diff --git a/fixture/DescribeImportSnapshotTasksResponse.proto b/fixture/DescribeImportSnapshotTasksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeImportSnapshotTasksResponse.proto
diff --git a/fixture/DescribeInstanceAttribute.yaml b/fixture/DescribeInstanceAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInstanceAttribute.yaml
diff --git a/fixture/DescribeInstanceAttributeResponse.proto b/fixture/DescribeInstanceAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInstanceAttributeResponse.proto
diff --git a/fixture/DescribeInstanceStatus.yaml b/fixture/DescribeInstanceStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInstanceStatus.yaml
diff --git a/fixture/DescribeInstanceStatusResponse.proto b/fixture/DescribeInstanceStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInstanceStatusResponse.proto
diff --git a/fixture/DescribeInstances.yaml b/fixture/DescribeInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInstances.yaml
@@ -0,0 +1,10 @@
+---
+method: POST
+headers:
+  Authorization:         AWS4-HMAC-SHA256 Credential=access/20091028/us-east-1/ec2/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=6730e35cdeff701e23e24d34983edcf52a7a324959100c8d2bcd7d1f9fd7d294
+  Host:                  ec2.us-east-1.amazonaws.com
+  Content-Type:          application/x-www-form-urlencoded; charset=utf-8
+  X-Amz-Content-SHA256:  8e74c3199fabb3f6708fdc25b3b741ca62cd0301c97ce69a06a1bd9df4a75ba5
+  X-Amz-Date:            20091028T223200Z
+body:
+  Action=DescribeInstances&Filter.1.Name=instance-type&Filter.1.Value.1=m1.small&Filter.1.Value.2=m1.large&Filter.2.Name=block-device-mapping.status&Filter.2.Value.1=attached&InstanceId.1=i-foo&InstanceId.2=i-bar&InstanceId.3=i-baz&Version=2015-04-15
diff --git a/fixture/DescribeInstancesResponse.proto b/fixture/DescribeInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInstancesResponse.proto
@@ -0,0 +1,106 @@
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2015-04-15/">
+  <requestId>fdcdcab1-ae5c-489e-9c33-4637c5dda355</requestId>
+  <reservationSet>
+    <item>
+      <reservationId>r-1a2b3c4d</reservationId>
+      <ownerId>123456789012</ownerId>
+      <groupSet>
+        <item>
+          <groupId>sg-1a2b3c4d</groupId>
+          <groupName>my-security-group</groupName>
+        </item>
+      </groupSet>
+      <instancesSet>
+        <item>
+          <instanceId>i-1a2b3c4d</instanceId>
+          <imageId>ami-1a2b3c4d</imageId>
+          <instanceState>
+            <code>16</code>
+            <name>running</name>
+          </instanceState>
+          <privateDnsName/>
+          <dnsName/>
+          <reason/>
+          <keyName>my-key-pair</keyName>
+          <amiLaunchIndex>0</amiLaunchIndex>
+          <productCodes/>
+          <instanceType>c1.medium</instanceType>
+          <launchTime>2014-03-18T21:47:02+0000</launchTime>
+          <placement>
+            <availabilityZone>us-west-2a</availabilityZone>
+            <groupName/>
+            <tenancy>default</tenancy>
+          </placement>
+          <platform>windows</platform>
+          <monitoring>
+            <state>disabled</state>
+          </monitoring>
+          <subnetId>subnet-1a2b3c4d</subnetId>
+          <vpcId>vpc-1a2b3c4d</vpcId>
+          <privateIpAddress>10.0.0.12</privateIpAddress>
+          <ipAddress>46.51.219.63</ipAddress>
+          <sourceDestCheck>true</sourceDestCheck>
+          <groupSet>
+            <item>
+              <groupId>sg-1a2b3c4d</groupId>
+              <groupName>my-security-group</groupName>
+            </item>
+          </groupSet>
+          <architecture>x86_64</architecture>
+          <rootDeviceType>ebs</rootDeviceType>
+          <rootDeviceName>/dev/sda1</rootDeviceName>
+          <blockDeviceMapping>
+            <item>
+              <deviceName>/dev/sda1</deviceName>
+              <ebs>
+                <volumeId>vol-1a2b3c4d</volumeId>
+                <status>attached</status>
+                <attachTime>2014-03-18T21:47:02+0000</attachTime>
+                <deleteOnTermination>true</deleteOnTermination>
+              </ebs>
+            </item>
+          </blockDeviceMapping>
+          <virtualizationType>hvm</virtualizationType>
+          <clientToken>ABCDE1234567890123</clientToken>
+          <tagSet>
+            <item>
+              <key>Name</key>
+              <value>Windows Instance</value>
+            </item>
+          </tagSet>
+          <hypervisor>xen</hypervisor>
+          <networkInterfaceSet>
+            <item>
+              <networkInterfaceId>eni-1a2b3c4d</networkInterfaceId>
+              <subnetId>subnet-1a2b3c4d</subnetId>
+              <vpcId>vpc-1a2b3c4d</vpcId>
+              <description>Primary network interface</description>
+              <ownerId>123456789012</ownerId>
+              <status>in-use</status>
+              <macAddress>1b:2b:3c:4d:5e:6f</macAddress>
+              <privateIpAddress>10.0.0.12</privateIpAddress>
+              <sourceDestCheck>true</sourceDestCheck>
+              <groupSet>
+                <item>
+                  <groupId>sg-1a2b3c4d</groupId>
+                  <groupName>my-security-group</groupName>
+                </item>
+              </groupSet>
+              <attachment>
+                <attachmentId>eni-attach-1a2b3c4d</attachmentId>
+                <deviceIndex>0</deviceIndex>
+                <status>attached</status>
+                <attachTime>2014-03-18T21:47:02+0000</attachTime>
+                <deleteOnTermination>true</deleteOnTermination>
+              </attachment>
+              <association>
+                <publicIp>198.51.100.63</publicIp>
+                <ipOwnerId>123456789012</ipOwnerId>
+              </association>
+            </item>
+          </networkInterfaceSet>
+        </item>
+      </instancesSet>
+    </item>
+  </reservationSet>
+</DescribeInstancesResponse>
diff --git a/fixture/DescribeInternetGateways.yaml b/fixture/DescribeInternetGateways.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInternetGateways.yaml
diff --git a/fixture/DescribeInternetGatewaysResponse.proto b/fixture/DescribeInternetGatewaysResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeInternetGatewaysResponse.proto
diff --git a/fixture/DescribeKeyPairs.yaml b/fixture/DescribeKeyPairs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeKeyPairs.yaml
diff --git a/fixture/DescribeKeyPairsResponse.proto b/fixture/DescribeKeyPairsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeKeyPairsResponse.proto
diff --git a/fixture/DescribeMovingAddresses.yaml b/fixture/DescribeMovingAddresses.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMovingAddresses.yaml
diff --git a/fixture/DescribeMovingAddressesResponse.proto b/fixture/DescribeMovingAddressesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMovingAddressesResponse.proto
diff --git a/fixture/DescribeNetworkACLs.yaml b/fixture/DescribeNetworkACLs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeNetworkACLs.yaml
diff --git a/fixture/DescribeNetworkACLsResponse.proto b/fixture/DescribeNetworkACLsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeNetworkACLsResponse.proto
diff --git a/fixture/DescribeNetworkInterfaceAttribute.yaml b/fixture/DescribeNetworkInterfaceAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeNetworkInterfaceAttribute.yaml
diff --git a/fixture/DescribeNetworkInterfaceAttributeResponse.proto b/fixture/DescribeNetworkInterfaceAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeNetworkInterfaceAttributeResponse.proto
diff --git a/fixture/DescribeNetworkInterfaces.yaml b/fixture/DescribeNetworkInterfaces.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeNetworkInterfaces.yaml
diff --git a/fixture/DescribeNetworkInterfacesResponse.proto b/fixture/DescribeNetworkInterfacesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeNetworkInterfacesResponse.proto
diff --git a/fixture/DescribePlacementGroups.yaml b/fixture/DescribePlacementGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribePlacementGroups.yaml
diff --git a/fixture/DescribePlacementGroupsResponse.proto b/fixture/DescribePlacementGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribePlacementGroupsResponse.proto
diff --git a/fixture/DescribePrefixLists.yaml b/fixture/DescribePrefixLists.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribePrefixLists.yaml
diff --git a/fixture/DescribePrefixListsResponse.proto b/fixture/DescribePrefixListsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribePrefixListsResponse.proto
diff --git a/fixture/DescribeRegions.yaml b/fixture/DescribeRegions.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeRegions.yaml
diff --git a/fixture/DescribeRegionsResponse.proto b/fixture/DescribeRegionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeRegionsResponse.proto
diff --git a/fixture/DescribeReservedInstances.yaml b/fixture/DescribeReservedInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstances.yaml
diff --git a/fixture/DescribeReservedInstancesListings.yaml b/fixture/DescribeReservedInstancesListings.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstancesListings.yaml
diff --git a/fixture/DescribeReservedInstancesListingsResponse.proto b/fixture/DescribeReservedInstancesListingsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstancesListingsResponse.proto
diff --git a/fixture/DescribeReservedInstancesModifications.yaml b/fixture/DescribeReservedInstancesModifications.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstancesModifications.yaml
diff --git a/fixture/DescribeReservedInstancesModificationsResponse.proto b/fixture/DescribeReservedInstancesModificationsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstancesModificationsResponse.proto
diff --git a/fixture/DescribeReservedInstancesOfferings.yaml b/fixture/DescribeReservedInstancesOfferings.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstancesOfferings.yaml
diff --git a/fixture/DescribeReservedInstancesOfferingsResponse.proto b/fixture/DescribeReservedInstancesOfferingsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstancesOfferingsResponse.proto
diff --git a/fixture/DescribeReservedInstancesResponse.proto b/fixture/DescribeReservedInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeReservedInstancesResponse.proto
diff --git a/fixture/DescribeRouteTables.yaml b/fixture/DescribeRouteTables.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeRouteTables.yaml
diff --git a/fixture/DescribeRouteTablesResponse.proto b/fixture/DescribeRouteTablesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeRouteTablesResponse.proto
diff --git a/fixture/DescribeSecurityGroups.yaml b/fixture/DescribeSecurityGroups.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSecurityGroups.yaml
diff --git a/fixture/DescribeSecurityGroupsResponse.proto b/fixture/DescribeSecurityGroupsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSecurityGroupsResponse.proto
diff --git a/fixture/DescribeSnapshotAttribute.yaml b/fixture/DescribeSnapshotAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotAttribute.yaml
diff --git a/fixture/DescribeSnapshotAttributeResponse.proto b/fixture/DescribeSnapshotAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotAttributeResponse.proto
diff --git a/fixture/DescribeSnapshots.yaml b/fixture/DescribeSnapshots.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshots.yaml
diff --git a/fixture/DescribeSnapshotsResponse.proto b/fixture/DescribeSnapshotsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotsResponse.proto
diff --git a/fixture/DescribeSpotDatafeedSubscription.yaml b/fixture/DescribeSpotDatafeedSubscription.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotDatafeedSubscription.yaml
diff --git a/fixture/DescribeSpotDatafeedSubscriptionResponse.proto b/fixture/DescribeSpotDatafeedSubscriptionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotDatafeedSubscriptionResponse.proto
diff --git a/fixture/DescribeSpotFleetInstances.yaml b/fixture/DescribeSpotFleetInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotFleetInstances.yaml
diff --git a/fixture/DescribeSpotFleetInstancesResponse.proto b/fixture/DescribeSpotFleetInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotFleetInstancesResponse.proto
diff --git a/fixture/DescribeSpotFleetRequestHistory.yaml b/fixture/DescribeSpotFleetRequestHistory.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotFleetRequestHistory.yaml
diff --git a/fixture/DescribeSpotFleetRequestHistoryResponse.proto b/fixture/DescribeSpotFleetRequestHistoryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotFleetRequestHistoryResponse.proto
diff --git a/fixture/DescribeSpotFleetRequests.yaml b/fixture/DescribeSpotFleetRequests.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotFleetRequests.yaml
diff --git a/fixture/DescribeSpotFleetRequestsResponse.proto b/fixture/DescribeSpotFleetRequestsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotFleetRequestsResponse.proto
diff --git a/fixture/DescribeSpotInstanceRequests.yaml b/fixture/DescribeSpotInstanceRequests.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotInstanceRequests.yaml
diff --git a/fixture/DescribeSpotInstanceRequestsResponse.proto b/fixture/DescribeSpotInstanceRequestsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotInstanceRequestsResponse.proto
diff --git a/fixture/DescribeSpotPriceHistory.yaml b/fixture/DescribeSpotPriceHistory.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotPriceHistory.yaml
diff --git a/fixture/DescribeSpotPriceHistoryResponse.proto b/fixture/DescribeSpotPriceHistoryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSpotPriceHistoryResponse.proto
diff --git a/fixture/DescribeSubnets.yaml b/fixture/DescribeSubnets.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSubnets.yaml
diff --git a/fixture/DescribeSubnetsResponse.proto b/fixture/DescribeSubnetsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSubnetsResponse.proto
diff --git a/fixture/DescribeTags.yaml b/fixture/DescribeTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTags.yaml
diff --git a/fixture/DescribeTagsResponse.proto b/fixture/DescribeTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTagsResponse.proto
diff --git a/fixture/DescribeVPCAttribute.yaml b/fixture/DescribeVPCAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCAttribute.yaml
diff --git a/fixture/DescribeVPCAttributeResponse.proto b/fixture/DescribeVPCAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCAttributeResponse.proto
diff --git a/fixture/DescribeVPCClassicLink.yaml b/fixture/DescribeVPCClassicLink.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCClassicLink.yaml
diff --git a/fixture/DescribeVPCClassicLinkResponse.proto b/fixture/DescribeVPCClassicLinkResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCClassicLinkResponse.proto
diff --git a/fixture/DescribeVPCEndpointServices.yaml b/fixture/DescribeVPCEndpointServices.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCEndpointServices.yaml
diff --git a/fixture/DescribeVPCEndpointServicesResponse.proto b/fixture/DescribeVPCEndpointServicesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCEndpointServicesResponse.proto
diff --git a/fixture/DescribeVPCEndpoints.yaml b/fixture/DescribeVPCEndpoints.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCEndpoints.yaml
diff --git a/fixture/DescribeVPCEndpointsResponse.proto b/fixture/DescribeVPCEndpointsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCEndpointsResponse.proto
diff --git a/fixture/DescribeVPCPeeringConnections.yaml b/fixture/DescribeVPCPeeringConnections.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCPeeringConnections.yaml
diff --git a/fixture/DescribeVPCPeeringConnectionsResponse.proto b/fixture/DescribeVPCPeeringConnectionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCPeeringConnectionsResponse.proto
diff --git a/fixture/DescribeVPCs.yaml b/fixture/DescribeVPCs.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCs.yaml
diff --git a/fixture/DescribeVPCsResponse.proto b/fixture/DescribeVPCsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPCsResponse.proto
diff --git a/fixture/DescribeVPNConnections.yaml b/fixture/DescribeVPNConnections.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPNConnections.yaml
diff --git a/fixture/DescribeVPNConnectionsResponse.proto b/fixture/DescribeVPNConnectionsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPNConnectionsResponse.proto
diff --git a/fixture/DescribeVPNGateways.yaml b/fixture/DescribeVPNGateways.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPNGateways.yaml
diff --git a/fixture/DescribeVPNGatewaysResponse.proto b/fixture/DescribeVPNGatewaysResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVPNGatewaysResponse.proto
diff --git a/fixture/DescribeVolumeAttribute.yaml b/fixture/DescribeVolumeAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVolumeAttribute.yaml
diff --git a/fixture/DescribeVolumeAttributeResponse.proto b/fixture/DescribeVolumeAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVolumeAttributeResponse.proto
diff --git a/fixture/DescribeVolumeStatus.yaml b/fixture/DescribeVolumeStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVolumeStatus.yaml
diff --git a/fixture/DescribeVolumeStatusResponse.proto b/fixture/DescribeVolumeStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVolumeStatusResponse.proto
diff --git a/fixture/DescribeVolumes.yaml b/fixture/DescribeVolumes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVolumes.yaml
@@ -0,0 +1,10 @@
+---
+method: POST
+headers:
+  Authorization:         AWS4-HMAC-SHA256 Credential=access/20091028/us-east-1/ec2/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=4d4feec12db89156943c54efc553c0eaaf0f0b338d6d3563e554ef2404d8c487
+  Host:                  ec2.us-east-1.amazonaws.com
+  Content-Type:          application/x-www-form-urlencoded; charset=utf-8
+  X-Amz-Content-SHA256:  cb99638689d7058ba63f04955b5f4037c9391699863d0bf007b5f802cd0e0036
+  X-Amz-Date:            20091028T223200Z
+body:
+  Action=DescribeVolumes&Filter.1.Name=tag%3AName&Filter.1.Value.1=octopus&Filter.2.Name=tag%3ARole&Filter.2.Value.1=database&Filter.2.Value.2=server&Version=2015-04-15&VolumeId.1=foo&VolumeId.2=bar&VolumeId.3=baz
diff --git a/fixture/DescribeVolumesResponse.proto b/fixture/DescribeVolumesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVolumesResponse.proto
diff --git a/fixture/DetachClassicLinkVPC.yaml b/fixture/DetachClassicLinkVPC.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DetachClassicLinkVPC.yaml
diff --git a/fixture/DetachClassicLinkVPCResponse.proto b/fixture/DetachClassicLinkVPCResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DetachClassicLinkVPCResponse.proto
diff --git a/fixture/DetachInternetGateway.yaml b/fixture/DetachInternetGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DetachInternetGateway.yaml
diff --git a/fixture/DetachInternetGatewayResponse.proto b/fixture/DetachInternetGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DetachInternetGatewayResponse.proto
diff --git a/fixture/DetachNetworkInterface.yaml b/fixture/DetachNetworkInterface.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DetachNetworkInterface.yaml
diff --git a/fixture/DetachNetworkInterfaceResponse.proto b/fixture/DetachNetworkInterfaceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DetachNetworkInterfaceResponse.proto
diff --git a/fixture/DetachVPNGateway.yaml b/fixture/DetachVPNGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DetachVPNGateway.yaml
diff --git a/fixture/DetachVPNGatewayResponse.proto b/fixture/DetachVPNGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DetachVPNGatewayResponse.proto
diff --git a/fixture/DetachVolume.yaml b/fixture/DetachVolume.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DetachVolume.yaml
diff --git a/fixture/DetachVolumeResponse.proto b/fixture/DetachVolumeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DetachVolumeResponse.proto
diff --git a/fixture/DisableVGWRoutePropagation.yaml b/fixture/DisableVGWRoutePropagation.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableVGWRoutePropagation.yaml
diff --git a/fixture/DisableVGWRoutePropagationResponse.proto b/fixture/DisableVGWRoutePropagationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableVGWRoutePropagationResponse.proto
diff --git a/fixture/DisableVPCClassicLink.yaml b/fixture/DisableVPCClassicLink.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableVPCClassicLink.yaml
diff --git a/fixture/DisableVPCClassicLinkResponse.proto b/fixture/DisableVPCClassicLinkResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableVPCClassicLinkResponse.proto
diff --git a/fixture/DisassociateAddress.yaml b/fixture/DisassociateAddress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisassociateAddress.yaml
diff --git a/fixture/DisassociateAddressResponse.proto b/fixture/DisassociateAddressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisassociateAddressResponse.proto
diff --git a/fixture/DisassociateRouteTable.yaml b/fixture/DisassociateRouteTable.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisassociateRouteTable.yaml
diff --git a/fixture/DisassociateRouteTableResponse.proto b/fixture/DisassociateRouteTableResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisassociateRouteTableResponse.proto
diff --git a/fixture/EnableVGWRoutePropagation.yaml b/fixture/EnableVGWRoutePropagation.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableVGWRoutePropagation.yaml
diff --git a/fixture/EnableVGWRoutePropagationResponse.proto b/fixture/EnableVGWRoutePropagationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableVGWRoutePropagationResponse.proto
diff --git a/fixture/EnableVPCClassicLink.yaml b/fixture/EnableVPCClassicLink.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableVPCClassicLink.yaml
diff --git a/fixture/EnableVPCClassicLinkResponse.proto b/fixture/EnableVPCClassicLinkResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableVPCClassicLinkResponse.proto
diff --git a/fixture/EnableVolumeIO.yaml b/fixture/EnableVolumeIO.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/EnableVolumeIO.yaml
diff --git a/fixture/EnableVolumeIOResponse.proto b/fixture/EnableVolumeIOResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/EnableVolumeIOResponse.proto
diff --git a/fixture/GetConsoleOutput.yaml b/fixture/GetConsoleOutput.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetConsoleOutput.yaml
diff --git a/fixture/GetConsoleOutputResponse.proto b/fixture/GetConsoleOutputResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetConsoleOutputResponse.proto
diff --git a/fixture/GetPasswordData.yaml b/fixture/GetPasswordData.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/GetPasswordData.yaml
diff --git a/fixture/GetPasswordDataResponse.proto b/fixture/GetPasswordDataResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/GetPasswordDataResponse.proto
diff --git a/fixture/ImportImage.yaml b/fixture/ImportImage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ImportImage.yaml
diff --git a/fixture/ImportImageResponse.proto b/fixture/ImportImageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ImportImageResponse.proto
diff --git a/fixture/ImportInstance.yaml b/fixture/ImportInstance.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ImportInstance.yaml
diff --git a/fixture/ImportInstanceResponse.proto b/fixture/ImportInstanceResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ImportInstanceResponse.proto
diff --git a/fixture/ImportKeyPair.yaml b/fixture/ImportKeyPair.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ImportKeyPair.yaml
diff --git a/fixture/ImportKeyPairResponse.proto b/fixture/ImportKeyPairResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ImportKeyPairResponse.proto
diff --git a/fixture/ImportSnapshot.yaml b/fixture/ImportSnapshot.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ImportSnapshot.yaml
diff --git a/fixture/ImportSnapshotResponse.proto b/fixture/ImportSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ImportSnapshotResponse.proto
diff --git a/fixture/ImportVolume.yaml b/fixture/ImportVolume.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ImportVolume.yaml
diff --git a/fixture/ImportVolumeResponse.proto b/fixture/ImportVolumeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ImportVolumeResponse.proto
diff --git a/fixture/ModifyImageAttribute.yaml b/fixture/ModifyImageAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyImageAttribute.yaml
diff --git a/fixture/ModifyImageAttributeResponse.proto b/fixture/ModifyImageAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyImageAttributeResponse.proto
diff --git a/fixture/ModifyInstanceAttribute.yaml b/fixture/ModifyInstanceAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyInstanceAttribute.yaml
diff --git a/fixture/ModifyInstanceAttributeResponse.proto b/fixture/ModifyInstanceAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyInstanceAttributeResponse.proto
diff --git a/fixture/ModifyNetworkInterfaceAttribute.yaml b/fixture/ModifyNetworkInterfaceAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyNetworkInterfaceAttribute.yaml
diff --git a/fixture/ModifyNetworkInterfaceAttributeResponse.proto b/fixture/ModifyNetworkInterfaceAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyNetworkInterfaceAttributeResponse.proto
diff --git a/fixture/ModifyReservedInstances.yaml b/fixture/ModifyReservedInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyReservedInstances.yaml
diff --git a/fixture/ModifyReservedInstancesResponse.proto b/fixture/ModifyReservedInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyReservedInstancesResponse.proto
diff --git a/fixture/ModifySnapshotAttribute.yaml b/fixture/ModifySnapshotAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifySnapshotAttribute.yaml
diff --git a/fixture/ModifySnapshotAttributeResponse.proto b/fixture/ModifySnapshotAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifySnapshotAttributeResponse.proto
diff --git a/fixture/ModifySubnetAttribute.yaml b/fixture/ModifySubnetAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifySubnetAttribute.yaml
diff --git a/fixture/ModifySubnetAttributeResponse.proto b/fixture/ModifySubnetAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifySubnetAttributeResponse.proto
diff --git a/fixture/ModifyVPCAttribute.yaml b/fixture/ModifyVPCAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyVPCAttribute.yaml
diff --git a/fixture/ModifyVPCAttributeResponse.proto b/fixture/ModifyVPCAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyVPCAttributeResponse.proto
diff --git a/fixture/ModifyVPCEndpoint.yaml b/fixture/ModifyVPCEndpoint.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyVPCEndpoint.yaml
diff --git a/fixture/ModifyVPCEndpointResponse.proto b/fixture/ModifyVPCEndpointResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyVPCEndpointResponse.proto
diff --git a/fixture/ModifyVolumeAttribute.yaml b/fixture/ModifyVolumeAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyVolumeAttribute.yaml
diff --git a/fixture/ModifyVolumeAttributeResponse.proto b/fixture/ModifyVolumeAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ModifyVolumeAttributeResponse.proto
diff --git a/fixture/MonitorInstances.yaml b/fixture/MonitorInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/MonitorInstances.yaml
diff --git a/fixture/MonitorInstancesResponse.proto b/fixture/MonitorInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/MonitorInstancesResponse.proto
diff --git a/fixture/MoveAddressToVPC.yaml b/fixture/MoveAddressToVPC.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/MoveAddressToVPC.yaml
diff --git a/fixture/MoveAddressToVPCResponse.proto b/fixture/MoveAddressToVPCResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/MoveAddressToVPCResponse.proto
diff --git a/fixture/PurchaseReservedInstancesOffering.yaml b/fixture/PurchaseReservedInstancesOffering.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/PurchaseReservedInstancesOffering.yaml
diff --git a/fixture/PurchaseReservedInstancesOfferingResponse.proto b/fixture/PurchaseReservedInstancesOfferingResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/PurchaseReservedInstancesOfferingResponse.proto
diff --git a/fixture/RebootInstances.yaml b/fixture/RebootInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RebootInstances.yaml
diff --git a/fixture/RebootInstancesResponse.proto b/fixture/RebootInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RebootInstancesResponse.proto
diff --git a/fixture/RegisterImage.yaml b/fixture/RegisterImage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RegisterImage.yaml
diff --git a/fixture/RegisterImageResponse.proto b/fixture/RegisterImageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RegisterImageResponse.proto
diff --git a/fixture/RejectVPCPeeringConnection.yaml b/fixture/RejectVPCPeeringConnection.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RejectVPCPeeringConnection.yaml
diff --git a/fixture/RejectVPCPeeringConnectionResponse.proto b/fixture/RejectVPCPeeringConnectionResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RejectVPCPeeringConnectionResponse.proto
diff --git a/fixture/ReleaseAddress.yaml b/fixture/ReleaseAddress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReleaseAddress.yaml
diff --git a/fixture/ReleaseAddressResponse.proto b/fixture/ReleaseAddressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReleaseAddressResponse.proto
diff --git a/fixture/ReplaceNetworkACLAssociation.yaml b/fixture/ReplaceNetworkACLAssociation.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceNetworkACLAssociation.yaml
diff --git a/fixture/ReplaceNetworkACLAssociationResponse.proto b/fixture/ReplaceNetworkACLAssociationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceNetworkACLAssociationResponse.proto
diff --git a/fixture/ReplaceNetworkACLEntry.yaml b/fixture/ReplaceNetworkACLEntry.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceNetworkACLEntry.yaml
diff --git a/fixture/ReplaceNetworkACLEntryResponse.proto b/fixture/ReplaceNetworkACLEntryResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceNetworkACLEntryResponse.proto
diff --git a/fixture/ReplaceRoute.yaml b/fixture/ReplaceRoute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceRoute.yaml
diff --git a/fixture/ReplaceRouteResponse.proto b/fixture/ReplaceRouteResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceRouteResponse.proto
diff --git a/fixture/ReplaceRouteTableAssociation.yaml b/fixture/ReplaceRouteTableAssociation.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceRouteTableAssociation.yaml
diff --git a/fixture/ReplaceRouteTableAssociationResponse.proto b/fixture/ReplaceRouteTableAssociationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReplaceRouteTableAssociationResponse.proto
diff --git a/fixture/ReportInstanceStatus.yaml b/fixture/ReportInstanceStatus.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ReportInstanceStatus.yaml
diff --git a/fixture/ReportInstanceStatusResponse.proto b/fixture/ReportInstanceStatusResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ReportInstanceStatusResponse.proto
diff --git a/fixture/RequestSpotFleet.yaml b/fixture/RequestSpotFleet.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RequestSpotFleet.yaml
diff --git a/fixture/RequestSpotFleetResponse.proto b/fixture/RequestSpotFleetResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RequestSpotFleetResponse.proto
diff --git a/fixture/RequestSpotInstances.yaml b/fixture/RequestSpotInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RequestSpotInstances.yaml
diff --git a/fixture/RequestSpotInstancesResponse.proto b/fixture/RequestSpotInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RequestSpotInstancesResponse.proto
diff --git a/fixture/ResetImageAttribute.yaml b/fixture/ResetImageAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResetImageAttribute.yaml
diff --git a/fixture/ResetImageAttributeResponse.proto b/fixture/ResetImageAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResetImageAttributeResponse.proto
diff --git a/fixture/ResetInstanceAttribute.yaml b/fixture/ResetInstanceAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResetInstanceAttribute.yaml
diff --git a/fixture/ResetInstanceAttributeResponse.proto b/fixture/ResetInstanceAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResetInstanceAttributeResponse.proto
diff --git a/fixture/ResetNetworkInterfaceAttribute.yaml b/fixture/ResetNetworkInterfaceAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResetNetworkInterfaceAttribute.yaml
diff --git a/fixture/ResetNetworkInterfaceAttributeResponse.proto b/fixture/ResetNetworkInterfaceAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResetNetworkInterfaceAttributeResponse.proto
diff --git a/fixture/ResetSnapshotAttribute.yaml b/fixture/ResetSnapshotAttribute.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResetSnapshotAttribute.yaml
diff --git a/fixture/ResetSnapshotAttributeResponse.proto b/fixture/ResetSnapshotAttributeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResetSnapshotAttributeResponse.proto
diff --git a/fixture/RestoreAddressToClassic.yaml b/fixture/RestoreAddressToClassic.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RestoreAddressToClassic.yaml
diff --git a/fixture/RestoreAddressToClassicResponse.proto b/fixture/RestoreAddressToClassicResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RestoreAddressToClassicResponse.proto
diff --git a/fixture/RevokeSecurityGroupEgress.yaml b/fixture/RevokeSecurityGroupEgress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeSecurityGroupEgress.yaml
diff --git a/fixture/RevokeSecurityGroupEgressResponse.proto b/fixture/RevokeSecurityGroupEgressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeSecurityGroupEgressResponse.proto
diff --git a/fixture/RevokeSecurityGroupIngress.yaml b/fixture/RevokeSecurityGroupIngress.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeSecurityGroupIngress.yaml
diff --git a/fixture/RevokeSecurityGroupIngressResponse.proto b/fixture/RevokeSecurityGroupIngressResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RevokeSecurityGroupIngressResponse.proto
diff --git a/fixture/RunInstances.yaml b/fixture/RunInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RunInstances.yaml
diff --git a/fixture/RunInstancesResponse.proto b/fixture/RunInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RunInstancesResponse.proto
diff --git a/fixture/StartInstances.yaml b/fixture/StartInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/StartInstances.yaml
diff --git a/fixture/StartInstancesResponse.proto b/fixture/StartInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/StartInstancesResponse.proto
diff --git a/fixture/StopInstances.yaml b/fixture/StopInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/StopInstances.yaml
diff --git a/fixture/StopInstancesResponse.proto b/fixture/StopInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/StopInstancesResponse.proto
diff --git a/fixture/TerminateInstances.yaml b/fixture/TerminateInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/TerminateInstances.yaml
diff --git a/fixture/TerminateInstancesResponse.proto b/fixture/TerminateInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/TerminateInstancesResponse.proto
diff --git a/fixture/UnassignPrivateIPAddresses.yaml b/fixture/UnassignPrivateIPAddresses.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UnassignPrivateIPAddresses.yaml
diff --git a/fixture/UnassignPrivateIPAddressesResponse.proto b/fixture/UnassignPrivateIPAddressesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UnassignPrivateIPAddressesResponse.proto
diff --git a/fixture/UnmonitorInstances.yaml b/fixture/UnmonitorInstances.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UnmonitorInstances.yaml
diff --git a/fixture/UnmonitorInstancesResponse.proto b/fixture/UnmonitorInstancesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UnmonitorInstancesResponse.proto
diff --git a/test/Test/AWS/Gen/EC2.hs b/test/Test/AWS/Gen/EC2.hs
--- a/test/Test/AWS/Gen/EC2.hs
+++ b/test/Test/AWS/Gen/EC2.hs
@@ -1131,2185 +1131,2185 @@
 testDetachNetworkInterface :: DetachNetworkInterface -> TestTree
 testDetachNetworkInterface = req
     "DetachNetworkInterface"
-    "fixture/DetachNetworkInterface"
+    "fixture/DetachNetworkInterface.yaml"
 
 testDeleteVPCEndpoints :: DeleteVPCEndpoints -> TestTree
 testDeleteVPCEndpoints = req
     "DeleteVPCEndpoints"
-    "fixture/DeleteVPCEndpoints"
+    "fixture/DeleteVPCEndpoints.yaml"
 
 testDeleteKeyPair :: DeleteKeyPair -> TestTree
 testDeleteKeyPair = req
     "DeleteKeyPair"
-    "fixture/DeleteKeyPair"
+    "fixture/DeleteKeyPair.yaml"
 
 testDeleteFlowLogs :: DeleteFlowLogs -> TestTree
 testDeleteFlowLogs = req
     "DeleteFlowLogs"
-    "fixture/DeleteFlowLogs"
+    "fixture/DeleteFlowLogs.yaml"
 
 testDescribeTags :: DescribeTags -> TestTree
 testDescribeTags = req
     "DescribeTags"
-    "fixture/DescribeTags"
+    "fixture/DescribeTags.yaml"
 
 testRevokeSecurityGroupEgress :: RevokeSecurityGroupEgress -> TestTree
 testRevokeSecurityGroupEgress = req
     "RevokeSecurityGroupEgress"
-    "fixture/RevokeSecurityGroupEgress"
+    "fixture/RevokeSecurityGroupEgress.yaml"
 
 testCreateVPNGateway :: CreateVPNGateway -> TestTree
 testCreateVPNGateway = req
     "CreateVPNGateway"
-    "fixture/CreateVPNGateway"
+    "fixture/CreateVPNGateway.yaml"
 
 testDetachInternetGateway :: DetachInternetGateway -> TestTree
 testDetachInternetGateway = req
     "DetachInternetGateway"
-    "fixture/DetachInternetGateway"
+    "fixture/DetachInternetGateway.yaml"
 
 testCreateNetworkACL :: CreateNetworkACL -> TestTree
 testCreateNetworkACL = req
     "CreateNetworkACL"
-    "fixture/CreateNetworkACL"
+    "fixture/CreateNetworkACL.yaml"
 
 testImportInstance :: ImportInstance -> TestTree
 testImportInstance = req
     "ImportInstance"
-    "fixture/ImportInstance"
+    "fixture/ImportInstance.yaml"
 
 testDescribeVPCClassicLink :: DescribeVPCClassicLink -> TestTree
 testDescribeVPCClassicLink = req
     "DescribeVPCClassicLink"
-    "fixture/DescribeVPCClassicLink"
+    "fixture/DescribeVPCClassicLink.yaml"
 
 testDeleteVPNConnection :: DeleteVPNConnection -> TestTree
 testDeleteVPNConnection = req
     "DeleteVPNConnection"
-    "fixture/DeleteVPNConnection"
+    "fixture/DeleteVPNConnection.yaml"
 
 testAuthorizeSecurityGroupEgress :: AuthorizeSecurityGroupEgress -> TestTree
 testAuthorizeSecurityGroupEgress = req
     "AuthorizeSecurityGroupEgress"
-    "fixture/AuthorizeSecurityGroupEgress"
+    "fixture/AuthorizeSecurityGroupEgress.yaml"
 
 testDescribeBundleTasks :: DescribeBundleTasks -> TestTree
 testDescribeBundleTasks = req
     "DescribeBundleTasks"
-    "fixture/DescribeBundleTasks"
+    "fixture/DescribeBundleTasks.yaml"
 
 testCreateInternetGateway :: CreateInternetGateway -> TestTree
 testCreateInternetGateway = req
     "CreateInternetGateway"
-    "fixture/CreateInternetGateway"
+    "fixture/CreateInternetGateway.yaml"
 
 testReleaseAddress :: ReleaseAddress -> TestTree
 testReleaseAddress = req
     "ReleaseAddress"
-    "fixture/ReleaseAddress"
+    "fixture/ReleaseAddress.yaml"
 
 testCancelBundleTask :: CancelBundleTask -> TestTree
 testCancelBundleTask = req
     "CancelBundleTask"
-    "fixture/CancelBundleTask"
+    "fixture/CancelBundleTask.yaml"
 
 testModifyNetworkInterfaceAttribute :: ModifyNetworkInterfaceAttribute -> TestTree
 testModifyNetworkInterfaceAttribute = req
     "ModifyNetworkInterfaceAttribute"
-    "fixture/ModifyNetworkInterfaceAttribute"
+    "fixture/ModifyNetworkInterfaceAttribute.yaml"
 
 testModifySubnetAttribute :: ModifySubnetAttribute -> TestTree
 testModifySubnetAttribute = req
     "ModifySubnetAttribute"
-    "fixture/ModifySubnetAttribute"
+    "fixture/ModifySubnetAttribute.yaml"
 
 testDeregisterImage :: DeregisterImage -> TestTree
 testDeregisterImage = req
     "DeregisterImage"
-    "fixture/DeregisterImage"
+    "fixture/DeregisterImage.yaml"
 
 testDetachVolume :: DetachVolume -> TestTree
 testDetachVolume = req
     "DetachVolume"
-    "fixture/DetachVolume"
+    "fixture/DetachVolume.yaml"
 
 testCancelReservedInstancesListing :: CancelReservedInstancesListing -> TestTree
 testCancelReservedInstancesListing = req
     "CancelReservedInstancesListing"
-    "fixture/CancelReservedInstancesListing"
+    "fixture/CancelReservedInstancesListing.yaml"
 
 testAttachClassicLinkVPC :: AttachClassicLinkVPC -> TestTree
 testAttachClassicLinkVPC = req
     "AttachClassicLinkVPC"
-    "fixture/AttachClassicLinkVPC"
+    "fixture/AttachClassicLinkVPC.yaml"
 
 testCancelSpotFleetRequests :: CancelSpotFleetRequests -> TestTree
 testCancelSpotFleetRequests = req
     "CancelSpotFleetRequests"
-    "fixture/CancelSpotFleetRequests"
+    "fixture/CancelSpotFleetRequests.yaml"
 
 testDescribeDHCPOptions :: DescribeDHCPOptions -> TestTree
 testDescribeDHCPOptions = req
     "DescribeDHCPOptions"
-    "fixture/DescribeDHCPOptions"
+    "fixture/DescribeDHCPOptions.yaml"
 
 testDescribeSpotPriceHistory :: DescribeSpotPriceHistory -> TestTree
 testDescribeSpotPriceHistory = req
     "DescribeSpotPriceHistory"
-    "fixture/DescribeSpotPriceHistory"
+    "fixture/DescribeSpotPriceHistory.yaml"
 
 testStopInstances :: StopInstances -> TestTree
 testStopInstances = req
     "StopInstances"
-    "fixture/StopInstances"
+    "fixture/StopInstances.yaml"
 
 testImportImage :: ImportImage -> TestTree
 testImportImage = req
     "ImportImage"
-    "fixture/ImportImage"
+    "fixture/ImportImage.yaml"
 
 testDeleteNetworkACLEntry :: DeleteNetworkACLEntry -> TestTree
 testDeleteNetworkACLEntry = req
     "DeleteNetworkACLEntry"
-    "fixture/DeleteNetworkACLEntry"
+    "fixture/DeleteNetworkACLEntry.yaml"
 
 testDisableVPCClassicLink :: DisableVPCClassicLink -> TestTree
 testDisableVPCClassicLink = req
     "DisableVPCClassicLink"
-    "fixture/DisableVPCClassicLink"
+    "fixture/DisableVPCClassicLink.yaml"
 
 testAuthorizeSecurityGroupIngress :: AuthorizeSecurityGroupIngress -> TestTree
 testAuthorizeSecurityGroupIngress = req
     "AuthorizeSecurityGroupIngress"
-    "fixture/AuthorizeSecurityGroupIngress"
+    "fixture/AuthorizeSecurityGroupIngress.yaml"
 
 testBundleInstance :: BundleInstance -> TestTree
 testBundleInstance = req
     "BundleInstance"
-    "fixture/BundleInstance"
+    "fixture/BundleInstance.yaml"
 
 testDescribeVPCEndpointServices :: DescribeVPCEndpointServices -> TestTree
 testDescribeVPCEndpointServices = req
     "DescribeVPCEndpointServices"
-    "fixture/DescribeVPCEndpointServices"
+    "fixture/DescribeVPCEndpointServices.yaml"
 
 testReplaceNetworkACLAssociation :: ReplaceNetworkACLAssociation -> TestTree
 testReplaceNetworkACLAssociation = req
     "ReplaceNetworkACLAssociation"
-    "fixture/ReplaceNetworkACLAssociation"
+    "fixture/ReplaceNetworkACLAssociation.yaml"
 
 testCreateVPCPeeringConnection :: CreateVPCPeeringConnection -> TestTree
 testCreateVPCPeeringConnection = req
     "CreateVPCPeeringConnection"
-    "fixture/CreateVPCPeeringConnection"
+    "fixture/CreateVPCPeeringConnection.yaml"
 
 testResetSnapshotAttribute :: ResetSnapshotAttribute -> TestTree
 testResetSnapshotAttribute = req
     "ResetSnapshotAttribute"
-    "fixture/ResetSnapshotAttribute"
+    "fixture/ResetSnapshotAttribute.yaml"
 
 testDescribeAddresses :: DescribeAddresses -> TestTree
 testDescribeAddresses = req
     "DescribeAddresses"
-    "fixture/DescribeAddresses"
+    "fixture/DescribeAddresses.yaml"
 
 testDescribeInternetGateways :: DescribeInternetGateways -> TestTree
 testDescribeInternetGateways = req
     "DescribeInternetGateways"
-    "fixture/DescribeInternetGateways"
+    "fixture/DescribeInternetGateways.yaml"
 
 testReplaceRoute :: ReplaceRoute -> TestTree
 testReplaceRoute = req
     "ReplaceRoute"
-    "fixture/ReplaceRoute"
+    "fixture/ReplaceRoute.yaml"
 
 testCreateTags :: CreateTags -> TestTree
 testCreateTags = req
     "CreateTags"
-    "fixture/CreateTags"
+    "fixture/CreateTags.yaml"
 
 testDescribeSubnets :: DescribeSubnets -> TestTree
 testDescribeSubnets = req
     "DescribeSubnets"
-    "fixture/DescribeSubnets"
+    "fixture/DescribeSubnets.yaml"
 
 testDescribeNetworkInterfaces :: DescribeNetworkInterfaces -> TestTree
 testDescribeNetworkInterfaces = req
     "DescribeNetworkInterfaces"
-    "fixture/DescribeNetworkInterfaces"
+    "fixture/DescribeNetworkInterfaces.yaml"
 
 testPurchaseReservedInstancesOffering :: PurchaseReservedInstancesOffering -> TestTree
 testPurchaseReservedInstancesOffering = req
     "PurchaseReservedInstancesOffering"
-    "fixture/PurchaseReservedInstancesOffering"
+    "fixture/PurchaseReservedInstancesOffering.yaml"
 
 testDescribeSnapshotAttribute :: DescribeSnapshotAttribute -> TestTree
 testDescribeSnapshotAttribute = req
     "DescribeSnapshotAttribute"
-    "fixture/DescribeSnapshotAttribute"
+    "fixture/DescribeSnapshotAttribute.yaml"
 
 testCreateCustomerGateway :: CreateCustomerGateway -> TestTree
 testCreateCustomerGateway = req
     "CreateCustomerGateway"
-    "fixture/CreateCustomerGateway"
+    "fixture/CreateCustomerGateway.yaml"
 
 testAttachInternetGateway :: AttachInternetGateway -> TestTree
 testAttachInternetGateway = req
     "AttachInternetGateway"
-    "fixture/AttachInternetGateway"
+    "fixture/AttachInternetGateway.yaml"
 
 testDeleteTags :: DeleteTags -> TestTree
 testDeleteTags = req
     "DeleteTags"
-    "fixture/DeleteTags"
+    "fixture/DeleteTags.yaml"
 
 testReplaceNetworkACLEntry :: ReplaceNetworkACLEntry -> TestTree
 testReplaceNetworkACLEntry = req
     "ReplaceNetworkACLEntry"
-    "fixture/ReplaceNetworkACLEntry"
+    "fixture/ReplaceNetworkACLEntry.yaml"
 
 testResetInstanceAttribute :: ResetInstanceAttribute -> TestTree
 testResetInstanceAttribute = req
     "ResetInstanceAttribute"
-    "fixture/ResetInstanceAttribute"
+    "fixture/ResetInstanceAttribute.yaml"
 
 testDeleteRoute :: DeleteRoute -> TestTree
 testDeleteRoute = req
     "DeleteRoute"
-    "fixture/DeleteRoute"
+    "fixture/DeleteRoute.yaml"
 
 testDescribeVPNConnections :: DescribeVPNConnections -> TestTree
 testDescribeVPNConnections = req
     "DescribeVPNConnections"
-    "fixture/DescribeVPNConnections"
+    "fixture/DescribeVPNConnections.yaml"
 
 testDescribeFlowLogs :: DescribeFlowLogs -> TestTree
 testDescribeFlowLogs = req
     "DescribeFlowLogs"
-    "fixture/DescribeFlowLogs"
+    "fixture/DescribeFlowLogs.yaml"
 
 testDeleteSecurityGroup :: DeleteSecurityGroup -> TestTree
 testDeleteSecurityGroup = req
     "DeleteSecurityGroup"
-    "fixture/DeleteSecurityGroup"
+    "fixture/DeleteSecurityGroup.yaml"
 
 testDescribeReservedInstancesOfferings :: DescribeReservedInstancesOfferings -> TestTree
 testDescribeReservedInstancesOfferings = req
     "DescribeReservedInstancesOfferings"
-    "fixture/DescribeReservedInstancesOfferings"
+    "fixture/DescribeReservedInstancesOfferings.yaml"
 
 testDeleteVPCPeeringConnection :: DeleteVPCPeeringConnection -> TestTree
 testDeleteVPCPeeringConnection = req
     "DeleteVPCPeeringConnection"
-    "fixture/DeleteVPCPeeringConnection"
+    "fixture/DeleteVPCPeeringConnection.yaml"
 
 testDescribeVPCEndpoints :: DescribeVPCEndpoints -> TestTree
 testDescribeVPCEndpoints = req
     "DescribeVPCEndpoints"
-    "fixture/DescribeVPCEndpoints"
+    "fixture/DescribeVPCEndpoints.yaml"
 
 testDescribeInstanceAttribute :: DescribeInstanceAttribute -> TestTree
 testDescribeInstanceAttribute = req
     "DescribeInstanceAttribute"
-    "fixture/DescribeInstanceAttribute"
+    "fixture/DescribeInstanceAttribute.yaml"
 
 testConfirmProductInstance :: ConfirmProductInstance -> TestTree
 testConfirmProductInstance = req
     "ConfirmProductInstance"
-    "fixture/ConfirmProductInstance"
+    "fixture/ConfirmProductInstance.yaml"
 
 testImportKeyPair :: ImportKeyPair -> TestTree
 testImportKeyPair = req
     "ImportKeyPair"
-    "fixture/ImportKeyPair"
+    "fixture/ImportKeyPair.yaml"
 
 testAttachNetworkInterface :: AttachNetworkInterface -> TestTree
 testAttachNetworkInterface = req
     "AttachNetworkInterface"
-    "fixture/AttachNetworkInterface"
+    "fixture/AttachNetworkInterface.yaml"
 
 testDescribeInstanceStatus :: DescribeInstanceStatus -> TestTree
 testDescribeInstanceStatus = req
     "DescribeInstanceStatus"
-    "fixture/DescribeInstanceStatus"
+    "fixture/DescribeInstanceStatus.yaml"
 
 testCancelConversionTask :: CancelConversionTask -> TestTree
 testCancelConversionTask = req
     "CancelConversionTask"
-    "fixture/CancelConversionTask"
+    "fixture/CancelConversionTask.yaml"
 
 testReportInstanceStatus :: ReportInstanceStatus -> TestTree
 testReportInstanceStatus = req
     "ReportInstanceStatus"
-    "fixture/ReportInstanceStatus"
+    "fixture/ReportInstanceStatus.yaml"
 
 testAssociateDHCPOptions :: AssociateDHCPOptions -> TestTree
 testAssociateDHCPOptions = req
     "AssociateDHCPOptions"
-    "fixture/AssociateDHCPOptions"
+    "fixture/AssociateDHCPOptions.yaml"
 
 testDescribeVPCs :: DescribeVPCs -> TestTree
 testDescribeVPCs = req
     "DescribeVPCs"
-    "fixture/DescribeVPCs"
+    "fixture/DescribeVPCs.yaml"
 
 testRequestSpotInstances :: RequestSpotInstances -> TestTree
 testRequestSpotInstances = req
     "RequestSpotInstances"
-    "fixture/RequestSpotInstances"
+    "fixture/RequestSpotInstances.yaml"
 
 testModifyImageAttribute :: ModifyImageAttribute -> TestTree
 testModifyImageAttribute = req
     "ModifyImageAttribute"
-    "fixture/ModifyImageAttribute"
+    "fixture/ModifyImageAttribute.yaml"
 
 testDescribeReservedInstances :: DescribeReservedInstances -> TestTree
 testDescribeReservedInstances = req
     "DescribeReservedInstances"
-    "fixture/DescribeReservedInstances"
+    "fixture/DescribeReservedInstances.yaml"
 
 testAllocateAddress :: AllocateAddress -> TestTree
 testAllocateAddress = req
     "AllocateAddress"
-    "fixture/AllocateAddress"
+    "fixture/AllocateAddress.yaml"
 
 testRunInstances :: RunInstances -> TestTree
 testRunInstances = req
     "RunInstances"
-    "fixture/RunInstances"
+    "fixture/RunInstances.yaml"
 
 testCreateRouteTable :: CreateRouteTable -> TestTree
 testCreateRouteTable = req
     "CreateRouteTable"
-    "fixture/CreateRouteTable"
+    "fixture/CreateRouteTable.yaml"
 
 testAttachVolume :: AttachVolume -> TestTree
 testAttachVolume = req
     "AttachVolume"
-    "fixture/AttachVolume"
+    "fixture/AttachVolume.yaml"
 
 testDescribeConversionTasks :: DescribeConversionTasks -> TestTree
 testDescribeConversionTasks = req
     "DescribeConversionTasks"
-    "fixture/DescribeConversionTasks"
+    "fixture/DescribeConversionTasks.yaml"
 
 testRejectVPCPeeringConnection :: RejectVPCPeeringConnection -> TestTree
 testRejectVPCPeeringConnection = req
     "RejectVPCPeeringConnection"
-    "fixture/RejectVPCPeeringConnection"
+    "fixture/RejectVPCPeeringConnection.yaml"
 
 testRevokeSecurityGroupIngress :: RevokeSecurityGroupIngress -> TestTree
 testRevokeSecurityGroupIngress = req
     "RevokeSecurityGroupIngress"
-    "fixture/RevokeSecurityGroupIngress"
+    "fixture/RevokeSecurityGroupIngress.yaml"
 
 testDescribeVolumes :: DescribeVolumes -> TestTree
 testDescribeVolumes = req
     "DescribeVolumes"
-    "fixture/DescribeVolumes"
+    "fixture/DescribeVolumes.yaml"
 
 testDeleteVPNConnectionRoute :: DeleteVPNConnectionRoute -> TestTree
 testDeleteVPNConnectionRoute = req
     "DeleteVPNConnectionRoute"
-    "fixture/DeleteVPNConnectionRoute"
+    "fixture/DeleteVPNConnectionRoute.yaml"
 
 testModifyReservedInstances :: ModifyReservedInstances -> TestTree
 testModifyReservedInstances = req
     "ModifyReservedInstances"
-    "fixture/ModifyReservedInstances"
+    "fixture/ModifyReservedInstances.yaml"
 
 testRegisterImage :: RegisterImage -> TestTree
 testRegisterImage = req
     "RegisterImage"
-    "fixture/RegisterImage"
+    "fixture/RegisterImage.yaml"
 
 testModifyVPCEndpoint :: ModifyVPCEndpoint -> TestTree
 testModifyVPCEndpoint = req
     "ModifyVPCEndpoint"
-    "fixture/ModifyVPCEndpoint"
+    "fixture/ModifyVPCEndpoint.yaml"
 
 testDeleteVPNGateway :: DeleteVPNGateway -> TestTree
 testDeleteVPNGateway = req
     "DeleteVPNGateway"
-    "fixture/DeleteVPNGateway"
+    "fixture/DeleteVPNGateway.yaml"
 
 testCreateVPC :: CreateVPC -> TestTree
 testCreateVPC = req
     "CreateVPC"
-    "fixture/CreateVPC"
+    "fixture/CreateVPC.yaml"
 
 testDescribeMovingAddresses :: DescribeMovingAddresses -> TestTree
 testDescribeMovingAddresses = req
     "DescribeMovingAddresses"
-    "fixture/DescribeMovingAddresses"
+    "fixture/DescribeMovingAddresses.yaml"
 
 testDescribeVolumeAttribute :: DescribeVolumeAttribute -> TestTree
 testDescribeVolumeAttribute = req
     "DescribeVolumeAttribute"
-    "fixture/DescribeVolumeAttribute"
+    "fixture/DescribeVolumeAttribute.yaml"
 
 testMoveAddressToVPC :: MoveAddressToVPC -> TestTree
 testMoveAddressToVPC = req
     "MoveAddressToVPC"
-    "fixture/MoveAddressToVPC"
+    "fixture/MoveAddressToVPC.yaml"
 
 testGetPasswordData :: GetPasswordData -> TestTree
 testGetPasswordData = req
     "GetPasswordData"
-    "fixture/GetPasswordData"
+    "fixture/GetPasswordData.yaml"
 
 testCreateFlowLogs :: CreateFlowLogs -> TestTree
 testCreateFlowLogs = req
     "CreateFlowLogs"
-    "fixture/CreateFlowLogs"
+    "fixture/CreateFlowLogs.yaml"
 
 testDescribeImportImageTasks :: DescribeImportImageTasks -> TestTree
 testDescribeImportImageTasks = req
     "DescribeImportImageTasks"
-    "fixture/DescribeImportImageTasks"
+    "fixture/DescribeImportImageTasks.yaml"
 
 testDeleteNetworkACL :: DeleteNetworkACL -> TestTree
 testDeleteNetworkACL = req
     "DeleteNetworkACL"
-    "fixture/DeleteNetworkACL"
+    "fixture/DeleteNetworkACL.yaml"
 
 testDescribeSpotFleetRequests :: DescribeSpotFleetRequests -> TestTree
 testDescribeSpotFleetRequests = req
     "DescribeSpotFleetRequests"
-    "fixture/DescribeSpotFleetRequests"
+    "fixture/DescribeSpotFleetRequests.yaml"
 
 testCopySnapshot :: CopySnapshot -> TestTree
 testCopySnapshot = req
     "CopySnapshot"
-    "fixture/CopySnapshot"
+    "fixture/CopySnapshot.yaml"
 
 testModifyVolumeAttribute :: ModifyVolumeAttribute -> TestTree
 testModifyVolumeAttribute = req
     "ModifyVolumeAttribute"
-    "fixture/ModifyVolumeAttribute"
+    "fixture/ModifyVolumeAttribute.yaml"
 
 testDescribeVPCAttribute :: DescribeVPCAttribute -> TestTree
 testDescribeVPCAttribute = req
     "DescribeVPCAttribute"
-    "fixture/DescribeVPCAttribute"
+    "fixture/DescribeVPCAttribute.yaml"
 
 testCreateVolume :: CreateVolume -> TestTree
 testCreateVolume = req
     "CreateVolume"
-    "fixture/CreateVolume"
+    "fixture/CreateVolume.yaml"
 
 testDisassociateAddress :: DisassociateAddress -> TestTree
 testDisassociateAddress = req
     "DisassociateAddress"
-    "fixture/DisassociateAddress"
+    "fixture/DisassociateAddress.yaml"
 
 testDeleteVPC :: DeleteVPC -> TestTree
 testDeleteVPC = req
     "DeleteVPC"
-    "fixture/DeleteVPC"
+    "fixture/DeleteVPC.yaml"
 
 testDescribePrefixLists :: DescribePrefixLists -> TestTree
 testDescribePrefixLists = req
     "DescribePrefixLists"
-    "fixture/DescribePrefixLists"
+    "fixture/DescribePrefixLists.yaml"
 
 testCreateInstanceExportTask :: CreateInstanceExportTask -> TestTree
 testCreateInstanceExportTask = req
     "CreateInstanceExportTask"
-    "fixture/CreateInstanceExportTask"
+    "fixture/CreateInstanceExportTask.yaml"
 
 testDescribeSpotDatafeedSubscription :: DescribeSpotDatafeedSubscription -> TestTree
 testDescribeSpotDatafeedSubscription = req
     "DescribeSpotDatafeedSubscription"
-    "fixture/DescribeSpotDatafeedSubscription"
+    "fixture/DescribeSpotDatafeedSubscription.yaml"
 
 testDetachVPNGateway :: DetachVPNGateway -> TestTree
 testDetachVPNGateway = req
     "DetachVPNGateway"
-    "fixture/DetachVPNGateway"
+    "fixture/DetachVPNGateway.yaml"
 
 testDescribeExportTasks :: DescribeExportTasks -> TestTree
 testDescribeExportTasks = req
     "DescribeExportTasks"
-    "fixture/DescribeExportTasks"
+    "fixture/DescribeExportTasks.yaml"
 
 testDeletePlacementGroup :: DeletePlacementGroup -> TestTree
 testDeletePlacementGroup = req
     "DeletePlacementGroup"
-    "fixture/DeletePlacementGroup"
+    "fixture/DeletePlacementGroup.yaml"
 
 testCreateSubnet :: CreateSubnet -> TestTree
 testCreateSubnet = req
     "CreateSubnet"
-    "fixture/CreateSubnet"
+    "fixture/CreateSubnet.yaml"
 
 testEnableVolumeIO :: EnableVolumeIO -> TestTree
 testEnableVolumeIO = req
     "EnableVolumeIO"
-    "fixture/EnableVolumeIO"
+    "fixture/EnableVolumeIO.yaml"
 
 testCancelExportTask :: CancelExportTask -> TestTree
 testCancelExportTask = req
     "CancelExportTask"
-    "fixture/CancelExportTask"
+    "fixture/CancelExportTask.yaml"
 
 testRequestSpotFleet :: RequestSpotFleet -> TestTree
 testRequestSpotFleet = req
     "RequestSpotFleet"
-    "fixture/RequestSpotFleet"
+    "fixture/RequestSpotFleet.yaml"
 
 testDescribeInstances :: DescribeInstances -> TestTree
 testDescribeInstances = req
     "DescribeInstances"
-    "fixture/DescribeInstances"
+    "fixture/DescribeInstances.yaml"
 
 testDescribeSecurityGroups :: DescribeSecurityGroups -> TestTree
 testDescribeSecurityGroups = req
     "DescribeSecurityGroups"
-    "fixture/DescribeSecurityGroups"
+    "fixture/DescribeSecurityGroups.yaml"
 
 testDescribeVPCPeeringConnections :: DescribeVPCPeeringConnections -> TestTree
 testDescribeVPCPeeringConnections = req
     "DescribeVPCPeeringConnections"
-    "fixture/DescribeVPCPeeringConnections"
+    "fixture/DescribeVPCPeeringConnections.yaml"
 
 testCreateNetworkInterface :: CreateNetworkInterface -> TestTree
 testCreateNetworkInterface = req
     "CreateNetworkInterface"
-    "fixture/CreateNetworkInterface"
+    "fixture/CreateNetworkInterface.yaml"
 
 testAssociateAddress :: AssociateAddress -> TestTree
 testAssociateAddress = req
     "AssociateAddress"
-    "fixture/AssociateAddress"
+    "fixture/AssociateAddress.yaml"
 
 testStartInstances :: StartInstances -> TestTree
 testStartInstances = req
     "StartInstances"
-    "fixture/StartInstances"
+    "fixture/StartInstances.yaml"
 
 testDescribeCustomerGateways :: DescribeCustomerGateways -> TestTree
 testDescribeCustomerGateways = req
     "DescribeCustomerGateways"
-    "fixture/DescribeCustomerGateways"
+    "fixture/DescribeCustomerGateways.yaml"
 
 testResetNetworkInterfaceAttribute :: ResetNetworkInterfaceAttribute -> TestTree
 testResetNetworkInterfaceAttribute = req
     "ResetNetworkInterfaceAttribute"
-    "fixture/ResetNetworkInterfaceAttribute"
+    "fixture/ResetNetworkInterfaceAttribute.yaml"
 
 testCreateVPNConnection :: CreateVPNConnection -> TestTree
 testCreateVPNConnection = req
     "CreateVPNConnection"
-    "fixture/CreateVPNConnection"
+    "fixture/CreateVPNConnection.yaml"
 
 testDescribeSnapshots :: DescribeSnapshots -> TestTree
 testDescribeSnapshots = req
     "DescribeSnapshots"
-    "fixture/DescribeSnapshots"
+    "fixture/DescribeSnapshots.yaml"
 
 testCreatePlacementGroup :: CreatePlacementGroup -> TestTree
 testCreatePlacementGroup = req
     "CreatePlacementGroup"
-    "fixture/CreatePlacementGroup"
+    "fixture/CreatePlacementGroup.yaml"
 
 testReplaceRouteTableAssociation :: ReplaceRouteTableAssociation -> TestTree
 testReplaceRouteTableAssociation = req
     "ReplaceRouteTableAssociation"
-    "fixture/ReplaceRouteTableAssociation"
+    "fixture/ReplaceRouteTableAssociation.yaml"
 
 testDescribeNetworkInterfaceAttribute :: DescribeNetworkInterfaceAttribute -> TestTree
 testDescribeNetworkInterfaceAttribute = req
     "DescribeNetworkInterfaceAttribute"
-    "fixture/DescribeNetworkInterfaceAttribute"
+    "fixture/DescribeNetworkInterfaceAttribute.yaml"
 
 testDescribeReservedInstancesListings :: DescribeReservedInstancesListings -> TestTree
 testDescribeReservedInstancesListings = req
     "DescribeReservedInstancesListings"
-    "fixture/DescribeReservedInstancesListings"
+    "fixture/DescribeReservedInstancesListings.yaml"
 
 testDeleteNetworkInterface :: DeleteNetworkInterface -> TestTree
 testDeleteNetworkInterface = req
     "DeleteNetworkInterface"
-    "fixture/DeleteNetworkInterface"
+    "fixture/DeleteNetworkInterface.yaml"
 
 testDeleteInternetGateway :: DeleteInternetGateway -> TestTree
 testDeleteInternetGateway = req
     "DeleteInternetGateway"
-    "fixture/DeleteInternetGateway"
+    "fixture/DeleteInternetGateway.yaml"
 
 testDeleteSubnet :: DeleteSubnet -> TestTree
 testDeleteSubnet = req
     "DeleteSubnet"
-    "fixture/DeleteSubnet"
+    "fixture/DeleteSubnet.yaml"
 
 testCreateVPCEndpoint :: CreateVPCEndpoint -> TestTree
 testCreateVPCEndpoint = req
     "CreateVPCEndpoint"
-    "fixture/CreateVPCEndpoint"
+    "fixture/CreateVPCEndpoint.yaml"
 
 testDescribeImportSnapshotTasks :: DescribeImportSnapshotTasks -> TestTree
 testDescribeImportSnapshotTasks = req
     "DescribeImportSnapshotTasks"
-    "fixture/DescribeImportSnapshotTasks"
+    "fixture/DescribeImportSnapshotTasks.yaml"
 
 testCopyImage :: CopyImage -> TestTree
 testCopyImage = req
     "CopyImage"
-    "fixture/CopyImage"
+    "fixture/CopyImage.yaml"
 
 testDisassociateRouteTable :: DisassociateRouteTable -> TestTree
 testDisassociateRouteTable = req
     "DisassociateRouteTable"
-    "fixture/DisassociateRouteTable"
+    "fixture/DisassociateRouteTable.yaml"
 
 testUnmonitorInstances :: UnmonitorInstances -> TestTree
 testUnmonitorInstances = req
     "UnmonitorInstances"
-    "fixture/UnmonitorInstances"
+    "fixture/UnmonitorInstances.yaml"
 
 testImportVolume :: ImportVolume -> TestTree
 testImportVolume = req
     "ImportVolume"
-    "fixture/ImportVolume"
+    "fixture/ImportVolume.yaml"
 
 testDisableVGWRoutePropagation :: DisableVGWRoutePropagation -> TestTree
 testDisableVGWRoutePropagation = req
     "DisableVGWRoutePropagation"
-    "fixture/DisableVGWRoutePropagation"
+    "fixture/DisableVGWRoutePropagation.yaml"
 
 testCreateSpotDatafeedSubscription :: CreateSpotDatafeedSubscription -> TestTree
 testCreateSpotDatafeedSubscription = req
     "CreateSpotDatafeedSubscription"
-    "fixture/CreateSpotDatafeedSubscription"
+    "fixture/CreateSpotDatafeedSubscription.yaml"
 
 testAssignPrivateIPAddresses :: AssignPrivateIPAddresses -> TestTree
 testAssignPrivateIPAddresses = req
     "AssignPrivateIPAddresses"
-    "fixture/AssignPrivateIPAddresses"
+    "fixture/AssignPrivateIPAddresses.yaml"
 
 testDeleteSnapshot :: DeleteSnapshot -> TestTree
 testDeleteSnapshot = req
     "DeleteSnapshot"
-    "fixture/DeleteSnapshot"
+    "fixture/DeleteSnapshot.yaml"
 
 testDeleteCustomerGateway :: DeleteCustomerGateway -> TestTree
 testDeleteCustomerGateway = req
     "DeleteCustomerGateway"
-    "fixture/DeleteCustomerGateway"
+    "fixture/DeleteCustomerGateway.yaml"
 
 testModifyInstanceAttribute :: ModifyInstanceAttribute -> TestTree
 testModifyInstanceAttribute = req
     "ModifyInstanceAttribute"
-    "fixture/ModifyInstanceAttribute"
+    "fixture/ModifyInstanceAttribute.yaml"
 
 testCreateSecurityGroup :: CreateSecurityGroup -> TestTree
 testCreateSecurityGroup = req
     "CreateSecurityGroup"
-    "fixture/CreateSecurityGroup"
+    "fixture/CreateSecurityGroup.yaml"
 
 testCancelSpotInstanceRequests :: CancelSpotInstanceRequests -> TestTree
 testCancelSpotInstanceRequests = req
     "CancelSpotInstanceRequests"
-    "fixture/CancelSpotInstanceRequests"
+    "fixture/CancelSpotInstanceRequests.yaml"
 
 testCreateRoute :: CreateRoute -> TestTree
 testCreateRoute = req
     "CreateRoute"
-    "fixture/CreateRoute"
+    "fixture/CreateRoute.yaml"
 
 testCreateNetworkACLEntry :: CreateNetworkACLEntry -> TestTree
 testCreateNetworkACLEntry = req
     "CreateNetworkACLEntry"
-    "fixture/CreateNetworkACLEntry"
+    "fixture/CreateNetworkACLEntry.yaml"
 
 testModifySnapshotAttribute :: ModifySnapshotAttribute -> TestTree
 testModifySnapshotAttribute = req
     "ModifySnapshotAttribute"
-    "fixture/ModifySnapshotAttribute"
+    "fixture/ModifySnapshotAttribute.yaml"
 
 testEnableVGWRoutePropagation :: EnableVGWRoutePropagation -> TestTree
 testEnableVGWRoutePropagation = req
     "EnableVGWRoutePropagation"
-    "fixture/EnableVGWRoutePropagation"
+    "fixture/EnableVGWRoutePropagation.yaml"
 
 testCreateSnapshot :: CreateSnapshot -> TestTree
 testCreateSnapshot = req
     "CreateSnapshot"
-    "fixture/CreateSnapshot"
+    "fixture/CreateSnapshot.yaml"
 
 testDescribeSpotFleetRequestHistory :: DescribeSpotFleetRequestHistory -> TestTree
 testDescribeSpotFleetRequestHistory = req
     "DescribeSpotFleetRequestHistory"
-    "fixture/DescribeSpotFleetRequestHistory"
+    "fixture/DescribeSpotFleetRequestHistory.yaml"
 
 testDeleteSpotDatafeedSubscription :: DeleteSpotDatafeedSubscription -> TestTree
 testDeleteSpotDatafeedSubscription = req
     "DeleteSpotDatafeedSubscription"
-    "fixture/DeleteSpotDatafeedSubscription"
+    "fixture/DeleteSpotDatafeedSubscription.yaml"
 
 testDescribePlacementGroups :: DescribePlacementGroups -> TestTree
 testDescribePlacementGroups = req
     "DescribePlacementGroups"
-    "fixture/DescribePlacementGroups"
+    "fixture/DescribePlacementGroups.yaml"
 
 testCreateReservedInstancesListing :: CreateReservedInstancesListing -> TestTree
 testCreateReservedInstancesListing = req
     "CreateReservedInstancesListing"
-    "fixture/CreateReservedInstancesListing"
+    "fixture/CreateReservedInstancesListing.yaml"
 
 testEnableVPCClassicLink :: EnableVPCClassicLink -> TestTree
 testEnableVPCClassicLink = req
     "EnableVPCClassicLink"
-    "fixture/EnableVPCClassicLink"
+    "fixture/EnableVPCClassicLink.yaml"
 
 testDescribeKeyPairs :: DescribeKeyPairs -> TestTree
 testDescribeKeyPairs = req
     "DescribeKeyPairs"
-    "fixture/DescribeKeyPairs"
+    "fixture/DescribeKeyPairs.yaml"
 
 testRebootInstances :: RebootInstances -> TestTree
 testRebootInstances = req
     "RebootInstances"
-    "fixture/RebootInstances"
+    "fixture/RebootInstances.yaml"
 
 testAttachVPNGateway :: AttachVPNGateway -> TestTree
 testAttachVPNGateway = req
     "AttachVPNGateway"
-    "fixture/AttachVPNGateway"
+    "fixture/AttachVPNGateway.yaml"
 
 testCreateVPNConnectionRoute :: CreateVPNConnectionRoute -> TestTree
 testCreateVPNConnectionRoute = req
     "CreateVPNConnectionRoute"
-    "fixture/CreateVPNConnectionRoute"
+    "fixture/CreateVPNConnectionRoute.yaml"
 
 testDescribeClassicLinkInstances :: DescribeClassicLinkInstances -> TestTree
 testDescribeClassicLinkInstances = req
     "DescribeClassicLinkInstances"
-    "fixture/DescribeClassicLinkInstances"
+    "fixture/DescribeClassicLinkInstances.yaml"
 
 testTerminateInstances :: TerminateInstances -> TestTree
 testTerminateInstances = req
     "TerminateInstances"
-    "fixture/TerminateInstances"
+    "fixture/TerminateInstances.yaml"
 
 testCreateDHCPOptions :: CreateDHCPOptions -> TestTree
 testCreateDHCPOptions = req
     "CreateDHCPOptions"
-    "fixture/CreateDHCPOptions"
+    "fixture/CreateDHCPOptions.yaml"
 
 testAssociateRouteTable :: AssociateRouteTable -> TestTree
 testAssociateRouteTable = req
     "AssociateRouteTable"
-    "fixture/AssociateRouteTable"
+    "fixture/AssociateRouteTable.yaml"
 
 testCreateImage :: CreateImage -> TestTree
 testCreateImage = req
     "CreateImage"
-    "fixture/CreateImage"
+    "fixture/CreateImage.yaml"
 
 testDescribeAccountAttributes :: DescribeAccountAttributes -> TestTree
 testDescribeAccountAttributes = req
     "DescribeAccountAttributes"
-    "fixture/DescribeAccountAttributes"
+    "fixture/DescribeAccountAttributes.yaml"
 
 testResetImageAttribute :: ResetImageAttribute -> TestTree
 testResetImageAttribute = req
     "ResetImageAttribute"
-    "fixture/ResetImageAttribute"
+    "fixture/ResetImageAttribute.yaml"
 
 testDescribeNetworkACLs :: DescribeNetworkACLs -> TestTree
 testDescribeNetworkACLs = req
     "DescribeNetworkACLs"
-    "fixture/DescribeNetworkACLs"
+    "fixture/DescribeNetworkACLs.yaml"
 
 testCancelImportTask :: CancelImportTask -> TestTree
 testCancelImportTask = req
     "CancelImportTask"
-    "fixture/CancelImportTask"
+    "fixture/CancelImportTask.yaml"
 
 testGetConsoleOutput :: GetConsoleOutput -> TestTree
 testGetConsoleOutput = req
     "GetConsoleOutput"
-    "fixture/GetConsoleOutput"
+    "fixture/GetConsoleOutput.yaml"
 
 testUnassignPrivateIPAddresses :: UnassignPrivateIPAddresses -> TestTree
 testUnassignPrivateIPAddresses = req
     "UnassignPrivateIPAddresses"
-    "fixture/UnassignPrivateIPAddresses"
+    "fixture/UnassignPrivateIPAddresses.yaml"
 
 testDeleteRouteTable :: DeleteRouteTable -> TestTree
 testDeleteRouteTable = req
     "DeleteRouteTable"
-    "fixture/DeleteRouteTable"
+    "fixture/DeleteRouteTable.yaml"
 
 testDescribeImageAttribute :: DescribeImageAttribute -> TestTree
 testDescribeImageAttribute = req
     "DescribeImageAttribute"
-    "fixture/DescribeImageAttribute"
+    "fixture/DescribeImageAttribute.yaml"
 
 testDeleteDHCPOptions :: DeleteDHCPOptions -> TestTree
 testDeleteDHCPOptions = req
     "DeleteDHCPOptions"
-    "fixture/DeleteDHCPOptions"
+    "fixture/DeleteDHCPOptions.yaml"
 
 testDescribeVPNGateways :: DescribeVPNGateways -> TestTree
 testDescribeVPNGateways = req
     "DescribeVPNGateways"
-    "fixture/DescribeVPNGateways"
+    "fixture/DescribeVPNGateways.yaml"
 
 testDetachClassicLinkVPC :: DetachClassicLinkVPC -> TestTree
 testDetachClassicLinkVPC = req
     "DetachClassicLinkVPC"
-    "fixture/DetachClassicLinkVPC"
+    "fixture/DetachClassicLinkVPC.yaml"
 
 testDescribeReservedInstancesModifications :: DescribeReservedInstancesModifications -> TestTree
 testDescribeReservedInstancesModifications = req
     "DescribeReservedInstancesModifications"
-    "fixture/DescribeReservedInstancesModifications"
+    "fixture/DescribeReservedInstancesModifications.yaml"
 
 testDescribeSpotInstanceRequests :: DescribeSpotInstanceRequests -> TestTree
 testDescribeSpotInstanceRequests = req
     "DescribeSpotInstanceRequests"
-    "fixture/DescribeSpotInstanceRequests"
+    "fixture/DescribeSpotInstanceRequests.yaml"
 
 testMonitorInstances :: MonitorInstances -> TestTree
 testMonitorInstances = req
     "MonitorInstances"
-    "fixture/MonitorInstances"
+    "fixture/MonitorInstances.yaml"
 
 testDescribeRegions :: DescribeRegions -> TestTree
 testDescribeRegions = req
     "DescribeRegions"
-    "fixture/DescribeRegions"
+    "fixture/DescribeRegions.yaml"
 
 testModifyVPCAttribute :: ModifyVPCAttribute -> TestTree
 testModifyVPCAttribute = req
     "ModifyVPCAttribute"
-    "fixture/ModifyVPCAttribute"
+    "fixture/ModifyVPCAttribute.yaml"
 
 testDescribeSpotFleetInstances :: DescribeSpotFleetInstances -> TestTree
 testDescribeSpotFleetInstances = req
     "DescribeSpotFleetInstances"
-    "fixture/DescribeSpotFleetInstances"
+    "fixture/DescribeSpotFleetInstances.yaml"
 
 testDescribeVolumeStatus :: DescribeVolumeStatus -> TestTree
 testDescribeVolumeStatus = req
     "DescribeVolumeStatus"
-    "fixture/DescribeVolumeStatus"
+    "fixture/DescribeVolumeStatus.yaml"
 
 testDeleteVolume :: DeleteVolume -> TestTree
 testDeleteVolume = req
     "DeleteVolume"
-    "fixture/DeleteVolume"
+    "fixture/DeleteVolume.yaml"
 
 testDescribeImages :: DescribeImages -> TestTree
 testDescribeImages = req
     "DescribeImages"
-    "fixture/DescribeImages"
+    "fixture/DescribeImages.yaml"
 
 testCreateKeyPair :: CreateKeyPair -> TestTree
 testCreateKeyPair = req
     "CreateKeyPair"
-    "fixture/CreateKeyPair"
+    "fixture/CreateKeyPair.yaml"
 
 testRestoreAddressToClassic :: RestoreAddressToClassic -> TestTree
 testRestoreAddressToClassic = req
     "RestoreAddressToClassic"
-    "fixture/RestoreAddressToClassic"
+    "fixture/RestoreAddressToClassic.yaml"
 
 testDescribeAvailabilityZones :: DescribeAvailabilityZones -> TestTree
 testDescribeAvailabilityZones = req
     "DescribeAvailabilityZones"
-    "fixture/DescribeAvailabilityZones"
+    "fixture/DescribeAvailabilityZones.yaml"
 
 testImportSnapshot :: ImportSnapshot -> TestTree
 testImportSnapshot = req
     "ImportSnapshot"
-    "fixture/ImportSnapshot"
+    "fixture/ImportSnapshot.yaml"
 
 testAcceptVPCPeeringConnection :: AcceptVPCPeeringConnection -> TestTree
 testAcceptVPCPeeringConnection = req
     "AcceptVPCPeeringConnection"
-    "fixture/AcceptVPCPeeringConnection"
+    "fixture/AcceptVPCPeeringConnection.yaml"
 
 testDescribeRouteTables :: DescribeRouteTables -> TestTree
 testDescribeRouteTables = req
     "DescribeRouteTables"
-    "fixture/DescribeRouteTables"
+    "fixture/DescribeRouteTables.yaml"
 
 -- Responses
 
 testDetachNetworkInterfaceResponse :: DetachNetworkInterfaceResponse -> TestTree
 testDetachNetworkInterfaceResponse = res
     "DetachNetworkInterfaceResponse"
-    "fixture/DetachNetworkInterfaceResponse"
+    "fixture/DetachNetworkInterfaceResponse.proto"
     eC2
     (Proxy :: Proxy DetachNetworkInterface)
 
 testDeleteVPCEndpointsResponse :: DeleteVPCEndpointsResponse -> TestTree
 testDeleteVPCEndpointsResponse = res
     "DeleteVPCEndpointsResponse"
-    "fixture/DeleteVPCEndpointsResponse"
+    "fixture/DeleteVPCEndpointsResponse.proto"
     eC2
     (Proxy :: Proxy DeleteVPCEndpoints)
 
 testDeleteKeyPairResponse :: DeleteKeyPairResponse -> TestTree
 testDeleteKeyPairResponse = res
     "DeleteKeyPairResponse"
-    "fixture/DeleteKeyPairResponse"
+    "fixture/DeleteKeyPairResponse.proto"
     eC2
     (Proxy :: Proxy DeleteKeyPair)
 
 testDeleteFlowLogsResponse :: DeleteFlowLogsResponse -> TestTree
 testDeleteFlowLogsResponse = res
     "DeleteFlowLogsResponse"
-    "fixture/DeleteFlowLogsResponse"
+    "fixture/DeleteFlowLogsResponse.proto"
     eC2
     (Proxy :: Proxy DeleteFlowLogs)
 
 testDescribeTagsResponse :: DescribeTagsResponse -> TestTree
 testDescribeTagsResponse = res
     "DescribeTagsResponse"
-    "fixture/DescribeTagsResponse"
+    "fixture/DescribeTagsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeTags)
 
 testRevokeSecurityGroupEgressResponse :: RevokeSecurityGroupEgressResponse -> TestTree
 testRevokeSecurityGroupEgressResponse = res
     "RevokeSecurityGroupEgressResponse"
-    "fixture/RevokeSecurityGroupEgressResponse"
+    "fixture/RevokeSecurityGroupEgressResponse.proto"
     eC2
     (Proxy :: Proxy RevokeSecurityGroupEgress)
 
 testCreateVPNGatewayResponse :: CreateVPNGatewayResponse -> TestTree
 testCreateVPNGatewayResponse = res
     "CreateVPNGatewayResponse"
-    "fixture/CreateVPNGatewayResponse"
+    "fixture/CreateVPNGatewayResponse.proto"
     eC2
     (Proxy :: Proxy CreateVPNGateway)
 
 testDetachInternetGatewayResponse :: DetachInternetGatewayResponse -> TestTree
 testDetachInternetGatewayResponse = res
     "DetachInternetGatewayResponse"
-    "fixture/DetachInternetGatewayResponse"
+    "fixture/DetachInternetGatewayResponse.proto"
     eC2
     (Proxy :: Proxy DetachInternetGateway)
 
 testCreateNetworkACLResponse :: CreateNetworkACLResponse -> TestTree
 testCreateNetworkACLResponse = res
     "CreateNetworkACLResponse"
-    "fixture/CreateNetworkACLResponse"
+    "fixture/CreateNetworkACLResponse.proto"
     eC2
     (Proxy :: Proxy CreateNetworkACL)
 
 testImportInstanceResponse :: ImportInstanceResponse -> TestTree
 testImportInstanceResponse = res
     "ImportInstanceResponse"
-    "fixture/ImportInstanceResponse"
+    "fixture/ImportInstanceResponse.proto"
     eC2
     (Proxy :: Proxy ImportInstance)
 
 testDescribeVPCClassicLinkResponse :: DescribeVPCClassicLinkResponse -> TestTree
 testDescribeVPCClassicLinkResponse = res
     "DescribeVPCClassicLinkResponse"
-    "fixture/DescribeVPCClassicLinkResponse"
+    "fixture/DescribeVPCClassicLinkResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPCClassicLink)
 
 testDeleteVPNConnectionResponse :: DeleteVPNConnectionResponse -> TestTree
 testDeleteVPNConnectionResponse = res
     "DeleteVPNConnectionResponse"
-    "fixture/DeleteVPNConnectionResponse"
+    "fixture/DeleteVPNConnectionResponse.proto"
     eC2
     (Proxy :: Proxy DeleteVPNConnection)
 
 testAuthorizeSecurityGroupEgressResponse :: AuthorizeSecurityGroupEgressResponse -> TestTree
 testAuthorizeSecurityGroupEgressResponse = res
     "AuthorizeSecurityGroupEgressResponse"
-    "fixture/AuthorizeSecurityGroupEgressResponse"
+    "fixture/AuthorizeSecurityGroupEgressResponse.proto"
     eC2
     (Proxy :: Proxy AuthorizeSecurityGroupEgress)
 
 testDescribeBundleTasksResponse :: DescribeBundleTasksResponse -> TestTree
 testDescribeBundleTasksResponse = res
     "DescribeBundleTasksResponse"
-    "fixture/DescribeBundleTasksResponse"
+    "fixture/DescribeBundleTasksResponse.proto"
     eC2
     (Proxy :: Proxy DescribeBundleTasks)
 
 testCreateInternetGatewayResponse :: CreateInternetGatewayResponse -> TestTree
 testCreateInternetGatewayResponse = res
     "CreateInternetGatewayResponse"
-    "fixture/CreateInternetGatewayResponse"
+    "fixture/CreateInternetGatewayResponse.proto"
     eC2
     (Proxy :: Proxy CreateInternetGateway)
 
 testReleaseAddressResponse :: ReleaseAddressResponse -> TestTree
 testReleaseAddressResponse = res
     "ReleaseAddressResponse"
-    "fixture/ReleaseAddressResponse"
+    "fixture/ReleaseAddressResponse.proto"
     eC2
     (Proxy :: Proxy ReleaseAddress)
 
 testCancelBundleTaskResponse :: CancelBundleTaskResponse -> TestTree
 testCancelBundleTaskResponse = res
     "CancelBundleTaskResponse"
-    "fixture/CancelBundleTaskResponse"
+    "fixture/CancelBundleTaskResponse.proto"
     eC2
     (Proxy :: Proxy CancelBundleTask)
 
 testModifyNetworkInterfaceAttributeResponse :: ModifyNetworkInterfaceAttributeResponse -> TestTree
 testModifyNetworkInterfaceAttributeResponse = res
     "ModifyNetworkInterfaceAttributeResponse"
-    "fixture/ModifyNetworkInterfaceAttributeResponse"
+    "fixture/ModifyNetworkInterfaceAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ModifyNetworkInterfaceAttribute)
 
 testModifySubnetAttributeResponse :: ModifySubnetAttributeResponse -> TestTree
 testModifySubnetAttributeResponse = res
     "ModifySubnetAttributeResponse"
-    "fixture/ModifySubnetAttributeResponse"
+    "fixture/ModifySubnetAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ModifySubnetAttribute)
 
 testDeregisterImageResponse :: DeregisterImageResponse -> TestTree
 testDeregisterImageResponse = res
     "DeregisterImageResponse"
-    "fixture/DeregisterImageResponse"
+    "fixture/DeregisterImageResponse.proto"
     eC2
     (Proxy :: Proxy DeregisterImage)
 
 testDetachVolumeResponse :: VolumeAttachment -> TestTree
 testDetachVolumeResponse = res
     "DetachVolumeResponse"
-    "fixture/DetachVolumeResponse"
+    "fixture/DetachVolumeResponse.proto"
     eC2
     (Proxy :: Proxy DetachVolume)
 
 testCancelReservedInstancesListingResponse :: CancelReservedInstancesListingResponse -> TestTree
 testCancelReservedInstancesListingResponse = res
     "CancelReservedInstancesListingResponse"
-    "fixture/CancelReservedInstancesListingResponse"
+    "fixture/CancelReservedInstancesListingResponse.proto"
     eC2
     (Proxy :: Proxy CancelReservedInstancesListing)
 
 testAttachClassicLinkVPCResponse :: AttachClassicLinkVPCResponse -> TestTree
 testAttachClassicLinkVPCResponse = res
     "AttachClassicLinkVPCResponse"
-    "fixture/AttachClassicLinkVPCResponse"
+    "fixture/AttachClassicLinkVPCResponse.proto"
     eC2
     (Proxy :: Proxy AttachClassicLinkVPC)
 
 testCancelSpotFleetRequestsResponse :: CancelSpotFleetRequestsResponse -> TestTree
 testCancelSpotFleetRequestsResponse = res
     "CancelSpotFleetRequestsResponse"
-    "fixture/CancelSpotFleetRequestsResponse"
+    "fixture/CancelSpotFleetRequestsResponse.proto"
     eC2
     (Proxy :: Proxy CancelSpotFleetRequests)
 
 testDescribeDHCPOptionsResponse :: DescribeDHCPOptionsResponse -> TestTree
 testDescribeDHCPOptionsResponse = res
     "DescribeDHCPOptionsResponse"
-    "fixture/DescribeDHCPOptionsResponse"
+    "fixture/DescribeDHCPOptionsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeDHCPOptions)
 
 testDescribeSpotPriceHistoryResponse :: DescribeSpotPriceHistoryResponse -> TestTree
 testDescribeSpotPriceHistoryResponse = res
     "DescribeSpotPriceHistoryResponse"
-    "fixture/DescribeSpotPriceHistoryResponse"
+    "fixture/DescribeSpotPriceHistoryResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSpotPriceHistory)
 
 testStopInstancesResponse :: StopInstancesResponse -> TestTree
 testStopInstancesResponse = res
     "StopInstancesResponse"
-    "fixture/StopInstancesResponse"
+    "fixture/StopInstancesResponse.proto"
     eC2
     (Proxy :: Proxy StopInstances)
 
 testImportImageResponse :: ImportImageResponse -> TestTree
 testImportImageResponse = res
     "ImportImageResponse"
-    "fixture/ImportImageResponse"
+    "fixture/ImportImageResponse.proto"
     eC2
     (Proxy :: Proxy ImportImage)
 
 testDeleteNetworkACLEntryResponse :: DeleteNetworkACLEntryResponse -> TestTree
 testDeleteNetworkACLEntryResponse = res
     "DeleteNetworkACLEntryResponse"
-    "fixture/DeleteNetworkACLEntryResponse"
+    "fixture/DeleteNetworkACLEntryResponse.proto"
     eC2
     (Proxy :: Proxy DeleteNetworkACLEntry)
 
 testDisableVPCClassicLinkResponse :: DisableVPCClassicLinkResponse -> TestTree
 testDisableVPCClassicLinkResponse = res
     "DisableVPCClassicLinkResponse"
-    "fixture/DisableVPCClassicLinkResponse"
+    "fixture/DisableVPCClassicLinkResponse.proto"
     eC2
     (Proxy :: Proxy DisableVPCClassicLink)
 
 testAuthorizeSecurityGroupIngressResponse :: AuthorizeSecurityGroupIngressResponse -> TestTree
 testAuthorizeSecurityGroupIngressResponse = res
     "AuthorizeSecurityGroupIngressResponse"
-    "fixture/AuthorizeSecurityGroupIngressResponse"
+    "fixture/AuthorizeSecurityGroupIngressResponse.proto"
     eC2
     (Proxy :: Proxy AuthorizeSecurityGroupIngress)
 
 testBundleInstanceResponse :: BundleInstanceResponse -> TestTree
 testBundleInstanceResponse = res
     "BundleInstanceResponse"
-    "fixture/BundleInstanceResponse"
+    "fixture/BundleInstanceResponse.proto"
     eC2
     (Proxy :: Proxy BundleInstance)
 
 testDescribeVPCEndpointServicesResponse :: DescribeVPCEndpointServicesResponse -> TestTree
 testDescribeVPCEndpointServicesResponse = res
     "DescribeVPCEndpointServicesResponse"
-    "fixture/DescribeVPCEndpointServicesResponse"
+    "fixture/DescribeVPCEndpointServicesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPCEndpointServices)
 
 testReplaceNetworkACLAssociationResponse :: ReplaceNetworkACLAssociationResponse -> TestTree
 testReplaceNetworkACLAssociationResponse = res
     "ReplaceNetworkACLAssociationResponse"
-    "fixture/ReplaceNetworkACLAssociationResponse"
+    "fixture/ReplaceNetworkACLAssociationResponse.proto"
     eC2
     (Proxy :: Proxy ReplaceNetworkACLAssociation)
 
 testCreateVPCPeeringConnectionResponse :: CreateVPCPeeringConnectionResponse -> TestTree
 testCreateVPCPeeringConnectionResponse = res
     "CreateVPCPeeringConnectionResponse"
-    "fixture/CreateVPCPeeringConnectionResponse"
+    "fixture/CreateVPCPeeringConnectionResponse.proto"
     eC2
     (Proxy :: Proxy CreateVPCPeeringConnection)
 
 testResetSnapshotAttributeResponse :: ResetSnapshotAttributeResponse -> TestTree
 testResetSnapshotAttributeResponse = res
     "ResetSnapshotAttributeResponse"
-    "fixture/ResetSnapshotAttributeResponse"
+    "fixture/ResetSnapshotAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ResetSnapshotAttribute)
 
 testDescribeAddressesResponse :: DescribeAddressesResponse -> TestTree
 testDescribeAddressesResponse = res
     "DescribeAddressesResponse"
-    "fixture/DescribeAddressesResponse"
+    "fixture/DescribeAddressesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeAddresses)
 
 testDescribeInternetGatewaysResponse :: DescribeInternetGatewaysResponse -> TestTree
 testDescribeInternetGatewaysResponse = res
     "DescribeInternetGatewaysResponse"
-    "fixture/DescribeInternetGatewaysResponse"
+    "fixture/DescribeInternetGatewaysResponse.proto"
     eC2
     (Proxy :: Proxy DescribeInternetGateways)
 
 testReplaceRouteResponse :: ReplaceRouteResponse -> TestTree
 testReplaceRouteResponse = res
     "ReplaceRouteResponse"
-    "fixture/ReplaceRouteResponse"
+    "fixture/ReplaceRouteResponse.proto"
     eC2
     (Proxy :: Proxy ReplaceRoute)
 
 testCreateTagsResponse :: CreateTagsResponse -> TestTree
 testCreateTagsResponse = res
     "CreateTagsResponse"
-    "fixture/CreateTagsResponse"
+    "fixture/CreateTagsResponse.proto"
     eC2
     (Proxy :: Proxy CreateTags)
 
 testDescribeSubnetsResponse :: DescribeSubnetsResponse -> TestTree
 testDescribeSubnetsResponse = res
     "DescribeSubnetsResponse"
-    "fixture/DescribeSubnetsResponse"
+    "fixture/DescribeSubnetsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSubnets)
 
 testDescribeNetworkInterfacesResponse :: DescribeNetworkInterfacesResponse -> TestTree
 testDescribeNetworkInterfacesResponse = res
     "DescribeNetworkInterfacesResponse"
-    "fixture/DescribeNetworkInterfacesResponse"
+    "fixture/DescribeNetworkInterfacesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeNetworkInterfaces)
 
 testPurchaseReservedInstancesOfferingResponse :: PurchaseReservedInstancesOfferingResponse -> TestTree
 testPurchaseReservedInstancesOfferingResponse = res
     "PurchaseReservedInstancesOfferingResponse"
-    "fixture/PurchaseReservedInstancesOfferingResponse"
+    "fixture/PurchaseReservedInstancesOfferingResponse.proto"
     eC2
     (Proxy :: Proxy PurchaseReservedInstancesOffering)
 
 testDescribeSnapshotAttributeResponse :: DescribeSnapshotAttributeResponse -> TestTree
 testDescribeSnapshotAttributeResponse = res
     "DescribeSnapshotAttributeResponse"
-    "fixture/DescribeSnapshotAttributeResponse"
+    "fixture/DescribeSnapshotAttributeResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSnapshotAttribute)
 
 testCreateCustomerGatewayResponse :: CreateCustomerGatewayResponse -> TestTree
 testCreateCustomerGatewayResponse = res
     "CreateCustomerGatewayResponse"
-    "fixture/CreateCustomerGatewayResponse"
+    "fixture/CreateCustomerGatewayResponse.proto"
     eC2
     (Proxy :: Proxy CreateCustomerGateway)
 
 testAttachInternetGatewayResponse :: AttachInternetGatewayResponse -> TestTree
 testAttachInternetGatewayResponse = res
     "AttachInternetGatewayResponse"
-    "fixture/AttachInternetGatewayResponse"
+    "fixture/AttachInternetGatewayResponse.proto"
     eC2
     (Proxy :: Proxy AttachInternetGateway)
 
 testDeleteTagsResponse :: DeleteTagsResponse -> TestTree
 testDeleteTagsResponse = res
     "DeleteTagsResponse"
-    "fixture/DeleteTagsResponse"
+    "fixture/DeleteTagsResponse.proto"
     eC2
     (Proxy :: Proxy DeleteTags)
 
 testReplaceNetworkACLEntryResponse :: ReplaceNetworkACLEntryResponse -> TestTree
 testReplaceNetworkACLEntryResponse = res
     "ReplaceNetworkACLEntryResponse"
-    "fixture/ReplaceNetworkACLEntryResponse"
+    "fixture/ReplaceNetworkACLEntryResponse.proto"
     eC2
     (Proxy :: Proxy ReplaceNetworkACLEntry)
 
 testResetInstanceAttributeResponse :: ResetInstanceAttributeResponse -> TestTree
 testResetInstanceAttributeResponse = res
     "ResetInstanceAttributeResponse"
-    "fixture/ResetInstanceAttributeResponse"
+    "fixture/ResetInstanceAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ResetInstanceAttribute)
 
 testDeleteRouteResponse :: DeleteRouteResponse -> TestTree
 testDeleteRouteResponse = res
     "DeleteRouteResponse"
-    "fixture/DeleteRouteResponse"
+    "fixture/DeleteRouteResponse.proto"
     eC2
     (Proxy :: Proxy DeleteRoute)
 
 testDescribeVPNConnectionsResponse :: DescribeVPNConnectionsResponse -> TestTree
 testDescribeVPNConnectionsResponse = res
     "DescribeVPNConnectionsResponse"
-    "fixture/DescribeVPNConnectionsResponse"
+    "fixture/DescribeVPNConnectionsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPNConnections)
 
 testDescribeFlowLogsResponse :: DescribeFlowLogsResponse -> TestTree
 testDescribeFlowLogsResponse = res
     "DescribeFlowLogsResponse"
-    "fixture/DescribeFlowLogsResponse"
+    "fixture/DescribeFlowLogsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeFlowLogs)
 
 testDeleteSecurityGroupResponse :: DeleteSecurityGroupResponse -> TestTree
 testDeleteSecurityGroupResponse = res
     "DeleteSecurityGroupResponse"
-    "fixture/DeleteSecurityGroupResponse"
+    "fixture/DeleteSecurityGroupResponse.proto"
     eC2
     (Proxy :: Proxy DeleteSecurityGroup)
 
 testDescribeReservedInstancesOfferingsResponse :: DescribeReservedInstancesOfferingsResponse -> TestTree
 testDescribeReservedInstancesOfferingsResponse = res
     "DescribeReservedInstancesOfferingsResponse"
-    "fixture/DescribeReservedInstancesOfferingsResponse"
+    "fixture/DescribeReservedInstancesOfferingsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeReservedInstancesOfferings)
 
 testDeleteVPCPeeringConnectionResponse :: DeleteVPCPeeringConnectionResponse -> TestTree
 testDeleteVPCPeeringConnectionResponse = res
     "DeleteVPCPeeringConnectionResponse"
-    "fixture/DeleteVPCPeeringConnectionResponse"
+    "fixture/DeleteVPCPeeringConnectionResponse.proto"
     eC2
     (Proxy :: Proxy DeleteVPCPeeringConnection)
 
 testDescribeVPCEndpointsResponse :: DescribeVPCEndpointsResponse -> TestTree
 testDescribeVPCEndpointsResponse = res
     "DescribeVPCEndpointsResponse"
-    "fixture/DescribeVPCEndpointsResponse"
+    "fixture/DescribeVPCEndpointsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPCEndpoints)
 
 testDescribeInstanceAttributeResponse :: DescribeInstanceAttributeResponse -> TestTree
 testDescribeInstanceAttributeResponse = res
     "DescribeInstanceAttributeResponse"
-    "fixture/DescribeInstanceAttributeResponse"
+    "fixture/DescribeInstanceAttributeResponse.proto"
     eC2
     (Proxy :: Proxy DescribeInstanceAttribute)
 
 testConfirmProductInstanceResponse :: ConfirmProductInstanceResponse -> TestTree
 testConfirmProductInstanceResponse = res
     "ConfirmProductInstanceResponse"
-    "fixture/ConfirmProductInstanceResponse"
+    "fixture/ConfirmProductInstanceResponse.proto"
     eC2
     (Proxy :: Proxy ConfirmProductInstance)
 
 testImportKeyPairResponse :: ImportKeyPairResponse -> TestTree
 testImportKeyPairResponse = res
     "ImportKeyPairResponse"
-    "fixture/ImportKeyPairResponse"
+    "fixture/ImportKeyPairResponse.proto"
     eC2
     (Proxy :: Proxy ImportKeyPair)
 
 testAttachNetworkInterfaceResponse :: AttachNetworkInterfaceResponse -> TestTree
 testAttachNetworkInterfaceResponse = res
     "AttachNetworkInterfaceResponse"
-    "fixture/AttachNetworkInterfaceResponse"
+    "fixture/AttachNetworkInterfaceResponse.proto"
     eC2
     (Proxy :: Proxy AttachNetworkInterface)
 
 testDescribeInstanceStatusResponse :: DescribeInstanceStatusResponse -> TestTree
 testDescribeInstanceStatusResponse = res
     "DescribeInstanceStatusResponse"
-    "fixture/DescribeInstanceStatusResponse"
+    "fixture/DescribeInstanceStatusResponse.proto"
     eC2
     (Proxy :: Proxy DescribeInstanceStatus)
 
 testCancelConversionTaskResponse :: CancelConversionTaskResponse -> TestTree
 testCancelConversionTaskResponse = res
     "CancelConversionTaskResponse"
-    "fixture/CancelConversionTaskResponse"
+    "fixture/CancelConversionTaskResponse.proto"
     eC2
     (Proxy :: Proxy CancelConversionTask)
 
 testReportInstanceStatusResponse :: ReportInstanceStatusResponse -> TestTree
 testReportInstanceStatusResponse = res
     "ReportInstanceStatusResponse"
-    "fixture/ReportInstanceStatusResponse"
+    "fixture/ReportInstanceStatusResponse.proto"
     eC2
     (Proxy :: Proxy ReportInstanceStatus)
 
 testAssociateDHCPOptionsResponse :: AssociateDHCPOptionsResponse -> TestTree
 testAssociateDHCPOptionsResponse = res
     "AssociateDHCPOptionsResponse"
-    "fixture/AssociateDHCPOptionsResponse"
+    "fixture/AssociateDHCPOptionsResponse.proto"
     eC2
     (Proxy :: Proxy AssociateDHCPOptions)
 
 testDescribeVPCsResponse :: DescribeVPCsResponse -> TestTree
 testDescribeVPCsResponse = res
     "DescribeVPCsResponse"
-    "fixture/DescribeVPCsResponse"
+    "fixture/DescribeVPCsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPCs)
 
 testRequestSpotInstancesResponse :: RequestSpotInstancesResponse -> TestTree
 testRequestSpotInstancesResponse = res
     "RequestSpotInstancesResponse"
-    "fixture/RequestSpotInstancesResponse"
+    "fixture/RequestSpotInstancesResponse.proto"
     eC2
     (Proxy :: Proxy RequestSpotInstances)
 
 testModifyImageAttributeResponse :: ModifyImageAttributeResponse -> TestTree
 testModifyImageAttributeResponse = res
     "ModifyImageAttributeResponse"
-    "fixture/ModifyImageAttributeResponse"
+    "fixture/ModifyImageAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ModifyImageAttribute)
 
 testDescribeReservedInstancesResponse :: DescribeReservedInstancesResponse -> TestTree
 testDescribeReservedInstancesResponse = res
     "DescribeReservedInstancesResponse"
-    "fixture/DescribeReservedInstancesResponse"
+    "fixture/DescribeReservedInstancesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeReservedInstances)
 
 testAllocateAddressResponse :: AllocateAddressResponse -> TestTree
 testAllocateAddressResponse = res
     "AllocateAddressResponse"
-    "fixture/AllocateAddressResponse"
+    "fixture/AllocateAddressResponse.proto"
     eC2
     (Proxy :: Proxy AllocateAddress)
 
 testRunInstancesResponse :: Reservation -> TestTree
 testRunInstancesResponse = res
     "RunInstancesResponse"
-    "fixture/RunInstancesResponse"
+    "fixture/RunInstancesResponse.proto"
     eC2
     (Proxy :: Proxy RunInstances)
 
 testCreateRouteTableResponse :: CreateRouteTableResponse -> TestTree
 testCreateRouteTableResponse = res
     "CreateRouteTableResponse"
-    "fixture/CreateRouteTableResponse"
+    "fixture/CreateRouteTableResponse.proto"
     eC2
     (Proxy :: Proxy CreateRouteTable)
 
 testAttachVolumeResponse :: VolumeAttachment -> TestTree
 testAttachVolumeResponse = res
     "AttachVolumeResponse"
-    "fixture/AttachVolumeResponse"
+    "fixture/AttachVolumeResponse.proto"
     eC2
     (Proxy :: Proxy AttachVolume)
 
 testDescribeConversionTasksResponse :: DescribeConversionTasksResponse -> TestTree
 testDescribeConversionTasksResponse = res
     "DescribeConversionTasksResponse"
-    "fixture/DescribeConversionTasksResponse"
+    "fixture/DescribeConversionTasksResponse.proto"
     eC2
     (Proxy :: Proxy DescribeConversionTasks)
 
 testRejectVPCPeeringConnectionResponse :: RejectVPCPeeringConnectionResponse -> TestTree
 testRejectVPCPeeringConnectionResponse = res
     "RejectVPCPeeringConnectionResponse"
-    "fixture/RejectVPCPeeringConnectionResponse"
+    "fixture/RejectVPCPeeringConnectionResponse.proto"
     eC2
     (Proxy :: Proxy RejectVPCPeeringConnection)
 
 testRevokeSecurityGroupIngressResponse :: RevokeSecurityGroupIngressResponse -> TestTree
 testRevokeSecurityGroupIngressResponse = res
     "RevokeSecurityGroupIngressResponse"
-    "fixture/RevokeSecurityGroupIngressResponse"
+    "fixture/RevokeSecurityGroupIngressResponse.proto"
     eC2
     (Proxy :: Proxy RevokeSecurityGroupIngress)
 
 testDescribeVolumesResponse :: DescribeVolumesResponse -> TestTree
 testDescribeVolumesResponse = res
     "DescribeVolumesResponse"
-    "fixture/DescribeVolumesResponse"
+    "fixture/DescribeVolumesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVolumes)
 
 testDeleteVPNConnectionRouteResponse :: DeleteVPNConnectionRouteResponse -> TestTree
 testDeleteVPNConnectionRouteResponse = res
     "DeleteVPNConnectionRouteResponse"
-    "fixture/DeleteVPNConnectionRouteResponse"
+    "fixture/DeleteVPNConnectionRouteResponse.proto"
     eC2
     (Proxy :: Proxy DeleteVPNConnectionRoute)
 
 testModifyReservedInstancesResponse :: ModifyReservedInstancesResponse -> TestTree
 testModifyReservedInstancesResponse = res
     "ModifyReservedInstancesResponse"
-    "fixture/ModifyReservedInstancesResponse"
+    "fixture/ModifyReservedInstancesResponse.proto"
     eC2
     (Proxy :: Proxy ModifyReservedInstances)
 
 testRegisterImageResponse :: RegisterImageResponse -> TestTree
 testRegisterImageResponse = res
     "RegisterImageResponse"
-    "fixture/RegisterImageResponse"
+    "fixture/RegisterImageResponse.proto"
     eC2
     (Proxy :: Proxy RegisterImage)
 
 testModifyVPCEndpointResponse :: ModifyVPCEndpointResponse -> TestTree
 testModifyVPCEndpointResponse = res
     "ModifyVPCEndpointResponse"
-    "fixture/ModifyVPCEndpointResponse"
+    "fixture/ModifyVPCEndpointResponse.proto"
     eC2
     (Proxy :: Proxy ModifyVPCEndpoint)
 
 testDeleteVPNGatewayResponse :: DeleteVPNGatewayResponse -> TestTree
 testDeleteVPNGatewayResponse = res
     "DeleteVPNGatewayResponse"
-    "fixture/DeleteVPNGatewayResponse"
+    "fixture/DeleteVPNGatewayResponse.proto"
     eC2
     (Proxy :: Proxy DeleteVPNGateway)
 
 testCreateVPCResponse :: CreateVPCResponse -> TestTree
 testCreateVPCResponse = res
     "CreateVPCResponse"
-    "fixture/CreateVPCResponse"
+    "fixture/CreateVPCResponse.proto"
     eC2
     (Proxy :: Proxy CreateVPC)
 
 testDescribeMovingAddressesResponse :: DescribeMovingAddressesResponse -> TestTree
 testDescribeMovingAddressesResponse = res
     "DescribeMovingAddressesResponse"
-    "fixture/DescribeMovingAddressesResponse"
+    "fixture/DescribeMovingAddressesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeMovingAddresses)
 
 testDescribeVolumeAttributeResponse :: DescribeVolumeAttributeResponse -> TestTree
 testDescribeVolumeAttributeResponse = res
     "DescribeVolumeAttributeResponse"
-    "fixture/DescribeVolumeAttributeResponse"
+    "fixture/DescribeVolumeAttributeResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVolumeAttribute)
 
 testMoveAddressToVPCResponse :: MoveAddressToVPCResponse -> TestTree
 testMoveAddressToVPCResponse = res
     "MoveAddressToVPCResponse"
-    "fixture/MoveAddressToVPCResponse"
+    "fixture/MoveAddressToVPCResponse.proto"
     eC2
     (Proxy :: Proxy MoveAddressToVPC)
 
 testGetPasswordDataResponse :: GetPasswordDataResponse -> TestTree
 testGetPasswordDataResponse = res
     "GetPasswordDataResponse"
-    "fixture/GetPasswordDataResponse"
+    "fixture/GetPasswordDataResponse.proto"
     eC2
     (Proxy :: Proxy GetPasswordData)
 
 testCreateFlowLogsResponse :: CreateFlowLogsResponse -> TestTree
 testCreateFlowLogsResponse = res
     "CreateFlowLogsResponse"
-    "fixture/CreateFlowLogsResponse"
+    "fixture/CreateFlowLogsResponse.proto"
     eC2
     (Proxy :: Proxy CreateFlowLogs)
 
 testDescribeImportImageTasksResponse :: DescribeImportImageTasksResponse -> TestTree
 testDescribeImportImageTasksResponse = res
     "DescribeImportImageTasksResponse"
-    "fixture/DescribeImportImageTasksResponse"
+    "fixture/DescribeImportImageTasksResponse.proto"
     eC2
     (Proxy :: Proxy DescribeImportImageTasks)
 
 testDeleteNetworkACLResponse :: DeleteNetworkACLResponse -> TestTree
 testDeleteNetworkACLResponse = res
     "DeleteNetworkACLResponse"
-    "fixture/DeleteNetworkACLResponse"
+    "fixture/DeleteNetworkACLResponse.proto"
     eC2
     (Proxy :: Proxy DeleteNetworkACL)
 
 testDescribeSpotFleetRequestsResponse :: DescribeSpotFleetRequestsResponse -> TestTree
 testDescribeSpotFleetRequestsResponse = res
     "DescribeSpotFleetRequestsResponse"
-    "fixture/DescribeSpotFleetRequestsResponse"
+    "fixture/DescribeSpotFleetRequestsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSpotFleetRequests)
 
 testCopySnapshotResponse :: CopySnapshotResponse -> TestTree
 testCopySnapshotResponse = res
     "CopySnapshotResponse"
-    "fixture/CopySnapshotResponse"
+    "fixture/CopySnapshotResponse.proto"
     eC2
     (Proxy :: Proxy CopySnapshot)
 
 testModifyVolumeAttributeResponse :: ModifyVolumeAttributeResponse -> TestTree
 testModifyVolumeAttributeResponse = res
     "ModifyVolumeAttributeResponse"
-    "fixture/ModifyVolumeAttributeResponse"
+    "fixture/ModifyVolumeAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ModifyVolumeAttribute)
 
 testDescribeVPCAttributeResponse :: DescribeVPCAttributeResponse -> TestTree
 testDescribeVPCAttributeResponse = res
     "DescribeVPCAttributeResponse"
-    "fixture/DescribeVPCAttributeResponse"
+    "fixture/DescribeVPCAttributeResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPCAttribute)
 
 testCreateVolumeResponse :: Volume -> TestTree
 testCreateVolumeResponse = res
     "CreateVolumeResponse"
-    "fixture/CreateVolumeResponse"
+    "fixture/CreateVolumeResponse.proto"
     eC2
     (Proxy :: Proxy CreateVolume)
 
 testDisassociateAddressResponse :: DisassociateAddressResponse -> TestTree
 testDisassociateAddressResponse = res
     "DisassociateAddressResponse"
-    "fixture/DisassociateAddressResponse"
+    "fixture/DisassociateAddressResponse.proto"
     eC2
     (Proxy :: Proxy DisassociateAddress)
 
 testDeleteVPCResponse :: DeleteVPCResponse -> TestTree
 testDeleteVPCResponse = res
     "DeleteVPCResponse"
-    "fixture/DeleteVPCResponse"
+    "fixture/DeleteVPCResponse.proto"
     eC2
     (Proxy :: Proxy DeleteVPC)
 
 testDescribePrefixListsResponse :: DescribePrefixListsResponse -> TestTree
 testDescribePrefixListsResponse = res
     "DescribePrefixListsResponse"
-    "fixture/DescribePrefixListsResponse"
+    "fixture/DescribePrefixListsResponse.proto"
     eC2
     (Proxy :: Proxy DescribePrefixLists)
 
 testCreateInstanceExportTaskResponse :: CreateInstanceExportTaskResponse -> TestTree
 testCreateInstanceExportTaskResponse = res
     "CreateInstanceExportTaskResponse"
-    "fixture/CreateInstanceExportTaskResponse"
+    "fixture/CreateInstanceExportTaskResponse.proto"
     eC2
     (Proxy :: Proxy CreateInstanceExportTask)
 
 testDescribeSpotDatafeedSubscriptionResponse :: DescribeSpotDatafeedSubscriptionResponse -> TestTree
 testDescribeSpotDatafeedSubscriptionResponse = res
     "DescribeSpotDatafeedSubscriptionResponse"
-    "fixture/DescribeSpotDatafeedSubscriptionResponse"
+    "fixture/DescribeSpotDatafeedSubscriptionResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSpotDatafeedSubscription)
 
 testDetachVPNGatewayResponse :: DetachVPNGatewayResponse -> TestTree
 testDetachVPNGatewayResponse = res
     "DetachVPNGatewayResponse"
-    "fixture/DetachVPNGatewayResponse"
+    "fixture/DetachVPNGatewayResponse.proto"
     eC2
     (Proxy :: Proxy DetachVPNGateway)
 
 testDescribeExportTasksResponse :: DescribeExportTasksResponse -> TestTree
 testDescribeExportTasksResponse = res
     "DescribeExportTasksResponse"
-    "fixture/DescribeExportTasksResponse"
+    "fixture/DescribeExportTasksResponse.proto"
     eC2
     (Proxy :: Proxy DescribeExportTasks)
 
 testDeletePlacementGroupResponse :: DeletePlacementGroupResponse -> TestTree
 testDeletePlacementGroupResponse = res
     "DeletePlacementGroupResponse"
-    "fixture/DeletePlacementGroupResponse"
+    "fixture/DeletePlacementGroupResponse.proto"
     eC2
     (Proxy :: Proxy DeletePlacementGroup)
 
 testCreateSubnetResponse :: CreateSubnetResponse -> TestTree
 testCreateSubnetResponse = res
     "CreateSubnetResponse"
-    "fixture/CreateSubnetResponse"
+    "fixture/CreateSubnetResponse.proto"
     eC2
     (Proxy :: Proxy CreateSubnet)
 
 testEnableVolumeIOResponse :: EnableVolumeIOResponse -> TestTree
 testEnableVolumeIOResponse = res
     "EnableVolumeIOResponse"
-    "fixture/EnableVolumeIOResponse"
+    "fixture/EnableVolumeIOResponse.proto"
     eC2
     (Proxy :: Proxy EnableVolumeIO)
 
 testCancelExportTaskResponse :: CancelExportTaskResponse -> TestTree
 testCancelExportTaskResponse = res
     "CancelExportTaskResponse"
-    "fixture/CancelExportTaskResponse"
+    "fixture/CancelExportTaskResponse.proto"
     eC2
     (Proxy :: Proxy CancelExportTask)
 
 testRequestSpotFleetResponse :: RequestSpotFleetResponse -> TestTree
 testRequestSpotFleetResponse = res
     "RequestSpotFleetResponse"
-    "fixture/RequestSpotFleetResponse"
+    "fixture/RequestSpotFleetResponse.proto"
     eC2
     (Proxy :: Proxy RequestSpotFleet)
 
 testDescribeInstancesResponse :: DescribeInstancesResponse -> TestTree
 testDescribeInstancesResponse = res
     "DescribeInstancesResponse"
-    "fixture/DescribeInstancesResponse"
+    "fixture/DescribeInstancesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeInstances)
 
 testDescribeSecurityGroupsResponse :: DescribeSecurityGroupsResponse -> TestTree
 testDescribeSecurityGroupsResponse = res
     "DescribeSecurityGroupsResponse"
-    "fixture/DescribeSecurityGroupsResponse"
+    "fixture/DescribeSecurityGroupsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSecurityGroups)
 
 testDescribeVPCPeeringConnectionsResponse :: DescribeVPCPeeringConnectionsResponse -> TestTree
 testDescribeVPCPeeringConnectionsResponse = res
     "DescribeVPCPeeringConnectionsResponse"
-    "fixture/DescribeVPCPeeringConnectionsResponse"
+    "fixture/DescribeVPCPeeringConnectionsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPCPeeringConnections)
 
 testCreateNetworkInterfaceResponse :: CreateNetworkInterfaceResponse -> TestTree
 testCreateNetworkInterfaceResponse = res
     "CreateNetworkInterfaceResponse"
-    "fixture/CreateNetworkInterfaceResponse"
+    "fixture/CreateNetworkInterfaceResponse.proto"
     eC2
     (Proxy :: Proxy CreateNetworkInterface)
 
 testAssociateAddressResponse :: AssociateAddressResponse -> TestTree
 testAssociateAddressResponse = res
     "AssociateAddressResponse"
-    "fixture/AssociateAddressResponse"
+    "fixture/AssociateAddressResponse.proto"
     eC2
     (Proxy :: Proxy AssociateAddress)
 
 testStartInstancesResponse :: StartInstancesResponse -> TestTree
 testStartInstancesResponse = res
     "StartInstancesResponse"
-    "fixture/StartInstancesResponse"
+    "fixture/StartInstancesResponse.proto"
     eC2
     (Proxy :: Proxy StartInstances)
 
 testDescribeCustomerGatewaysResponse :: DescribeCustomerGatewaysResponse -> TestTree
 testDescribeCustomerGatewaysResponse = res
     "DescribeCustomerGatewaysResponse"
-    "fixture/DescribeCustomerGatewaysResponse"
+    "fixture/DescribeCustomerGatewaysResponse.proto"
     eC2
     (Proxy :: Proxy DescribeCustomerGateways)
 
 testResetNetworkInterfaceAttributeResponse :: ResetNetworkInterfaceAttributeResponse -> TestTree
 testResetNetworkInterfaceAttributeResponse = res
     "ResetNetworkInterfaceAttributeResponse"
-    "fixture/ResetNetworkInterfaceAttributeResponse"
+    "fixture/ResetNetworkInterfaceAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ResetNetworkInterfaceAttribute)
 
 testCreateVPNConnectionResponse :: CreateVPNConnectionResponse -> TestTree
 testCreateVPNConnectionResponse = res
     "CreateVPNConnectionResponse"
-    "fixture/CreateVPNConnectionResponse"
+    "fixture/CreateVPNConnectionResponse.proto"
     eC2
     (Proxy :: Proxy CreateVPNConnection)
 
 testDescribeSnapshotsResponse :: DescribeSnapshotsResponse -> TestTree
 testDescribeSnapshotsResponse = res
     "DescribeSnapshotsResponse"
-    "fixture/DescribeSnapshotsResponse"
+    "fixture/DescribeSnapshotsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSnapshots)
 
 testCreatePlacementGroupResponse :: CreatePlacementGroupResponse -> TestTree
 testCreatePlacementGroupResponse = res
     "CreatePlacementGroupResponse"
-    "fixture/CreatePlacementGroupResponse"
+    "fixture/CreatePlacementGroupResponse.proto"
     eC2
     (Proxy :: Proxy CreatePlacementGroup)
 
 testReplaceRouteTableAssociationResponse :: ReplaceRouteTableAssociationResponse -> TestTree
 testReplaceRouteTableAssociationResponse = res
     "ReplaceRouteTableAssociationResponse"
-    "fixture/ReplaceRouteTableAssociationResponse"
+    "fixture/ReplaceRouteTableAssociationResponse.proto"
     eC2
     (Proxy :: Proxy ReplaceRouteTableAssociation)
 
 testDescribeNetworkInterfaceAttributeResponse :: DescribeNetworkInterfaceAttributeResponse -> TestTree
 testDescribeNetworkInterfaceAttributeResponse = res
     "DescribeNetworkInterfaceAttributeResponse"
-    "fixture/DescribeNetworkInterfaceAttributeResponse"
+    "fixture/DescribeNetworkInterfaceAttributeResponse.proto"
     eC2
     (Proxy :: Proxy DescribeNetworkInterfaceAttribute)
 
 testDescribeReservedInstancesListingsResponse :: DescribeReservedInstancesListingsResponse -> TestTree
 testDescribeReservedInstancesListingsResponse = res
     "DescribeReservedInstancesListingsResponse"
-    "fixture/DescribeReservedInstancesListingsResponse"
+    "fixture/DescribeReservedInstancesListingsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeReservedInstancesListings)
 
 testDeleteNetworkInterfaceResponse :: DeleteNetworkInterfaceResponse -> TestTree
 testDeleteNetworkInterfaceResponse = res
     "DeleteNetworkInterfaceResponse"
-    "fixture/DeleteNetworkInterfaceResponse"
+    "fixture/DeleteNetworkInterfaceResponse.proto"
     eC2
     (Proxy :: Proxy DeleteNetworkInterface)
 
 testDeleteInternetGatewayResponse :: DeleteInternetGatewayResponse -> TestTree
 testDeleteInternetGatewayResponse = res
     "DeleteInternetGatewayResponse"
-    "fixture/DeleteInternetGatewayResponse"
+    "fixture/DeleteInternetGatewayResponse.proto"
     eC2
     (Proxy :: Proxy DeleteInternetGateway)
 
 testDeleteSubnetResponse :: DeleteSubnetResponse -> TestTree
 testDeleteSubnetResponse = res
     "DeleteSubnetResponse"
-    "fixture/DeleteSubnetResponse"
+    "fixture/DeleteSubnetResponse.proto"
     eC2
     (Proxy :: Proxy DeleteSubnet)
 
 testCreateVPCEndpointResponse :: CreateVPCEndpointResponse -> TestTree
 testCreateVPCEndpointResponse = res
     "CreateVPCEndpointResponse"
-    "fixture/CreateVPCEndpointResponse"
+    "fixture/CreateVPCEndpointResponse.proto"
     eC2
     (Proxy :: Proxy CreateVPCEndpoint)
 
 testDescribeImportSnapshotTasksResponse :: DescribeImportSnapshotTasksResponse -> TestTree
 testDescribeImportSnapshotTasksResponse = res
     "DescribeImportSnapshotTasksResponse"
-    "fixture/DescribeImportSnapshotTasksResponse"
+    "fixture/DescribeImportSnapshotTasksResponse.proto"
     eC2
     (Proxy :: Proxy DescribeImportSnapshotTasks)
 
 testCopyImageResponse :: CopyImageResponse -> TestTree
 testCopyImageResponse = res
     "CopyImageResponse"
-    "fixture/CopyImageResponse"
+    "fixture/CopyImageResponse.proto"
     eC2
     (Proxy :: Proxy CopyImage)
 
 testDisassociateRouteTableResponse :: DisassociateRouteTableResponse -> TestTree
 testDisassociateRouteTableResponse = res
     "DisassociateRouteTableResponse"
-    "fixture/DisassociateRouteTableResponse"
+    "fixture/DisassociateRouteTableResponse.proto"
     eC2
     (Proxy :: Proxy DisassociateRouteTable)
 
 testUnmonitorInstancesResponse :: UnmonitorInstancesResponse -> TestTree
 testUnmonitorInstancesResponse = res
     "UnmonitorInstancesResponse"
-    "fixture/UnmonitorInstancesResponse"
+    "fixture/UnmonitorInstancesResponse.proto"
     eC2
     (Proxy :: Proxy UnmonitorInstances)
 
 testImportVolumeResponse :: ImportVolumeResponse -> TestTree
 testImportVolumeResponse = res
     "ImportVolumeResponse"
-    "fixture/ImportVolumeResponse"
+    "fixture/ImportVolumeResponse.proto"
     eC2
     (Proxy :: Proxy ImportVolume)
 
 testDisableVGWRoutePropagationResponse :: DisableVGWRoutePropagationResponse -> TestTree
 testDisableVGWRoutePropagationResponse = res
     "DisableVGWRoutePropagationResponse"
-    "fixture/DisableVGWRoutePropagationResponse"
+    "fixture/DisableVGWRoutePropagationResponse.proto"
     eC2
     (Proxy :: Proxy DisableVGWRoutePropagation)
 
 testCreateSpotDatafeedSubscriptionResponse :: CreateSpotDatafeedSubscriptionResponse -> TestTree
 testCreateSpotDatafeedSubscriptionResponse = res
     "CreateSpotDatafeedSubscriptionResponse"
-    "fixture/CreateSpotDatafeedSubscriptionResponse"
+    "fixture/CreateSpotDatafeedSubscriptionResponse.proto"
     eC2
     (Proxy :: Proxy CreateSpotDatafeedSubscription)
 
 testAssignPrivateIPAddressesResponse :: AssignPrivateIPAddressesResponse -> TestTree
 testAssignPrivateIPAddressesResponse = res
     "AssignPrivateIPAddressesResponse"
-    "fixture/AssignPrivateIPAddressesResponse"
+    "fixture/AssignPrivateIPAddressesResponse.proto"
     eC2
     (Proxy :: Proxy AssignPrivateIPAddresses)
 
 testDeleteSnapshotResponse :: DeleteSnapshotResponse -> TestTree
 testDeleteSnapshotResponse = res
     "DeleteSnapshotResponse"
-    "fixture/DeleteSnapshotResponse"
+    "fixture/DeleteSnapshotResponse.proto"
     eC2
     (Proxy :: Proxy DeleteSnapshot)
 
 testDeleteCustomerGatewayResponse :: DeleteCustomerGatewayResponse -> TestTree
 testDeleteCustomerGatewayResponse = res
     "DeleteCustomerGatewayResponse"
-    "fixture/DeleteCustomerGatewayResponse"
+    "fixture/DeleteCustomerGatewayResponse.proto"
     eC2
     (Proxy :: Proxy DeleteCustomerGateway)
 
 testModifyInstanceAttributeResponse :: ModifyInstanceAttributeResponse -> TestTree
 testModifyInstanceAttributeResponse = res
     "ModifyInstanceAttributeResponse"
-    "fixture/ModifyInstanceAttributeResponse"
+    "fixture/ModifyInstanceAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ModifyInstanceAttribute)
 
 testCreateSecurityGroupResponse :: CreateSecurityGroupResponse -> TestTree
 testCreateSecurityGroupResponse = res
     "CreateSecurityGroupResponse"
-    "fixture/CreateSecurityGroupResponse"
+    "fixture/CreateSecurityGroupResponse.proto"
     eC2
     (Proxy :: Proxy CreateSecurityGroup)
 
 testCancelSpotInstanceRequestsResponse :: CancelSpotInstanceRequestsResponse -> TestTree
 testCancelSpotInstanceRequestsResponse = res
     "CancelSpotInstanceRequestsResponse"
-    "fixture/CancelSpotInstanceRequestsResponse"
+    "fixture/CancelSpotInstanceRequestsResponse.proto"
     eC2
     (Proxy :: Proxy CancelSpotInstanceRequests)
 
 testCreateRouteResponse :: CreateRouteResponse -> TestTree
 testCreateRouteResponse = res
     "CreateRouteResponse"
-    "fixture/CreateRouteResponse"
+    "fixture/CreateRouteResponse.proto"
     eC2
     (Proxy :: Proxy CreateRoute)
 
 testCreateNetworkACLEntryResponse :: CreateNetworkACLEntryResponse -> TestTree
 testCreateNetworkACLEntryResponse = res
     "CreateNetworkACLEntryResponse"
-    "fixture/CreateNetworkACLEntryResponse"
+    "fixture/CreateNetworkACLEntryResponse.proto"
     eC2
     (Proxy :: Proxy CreateNetworkACLEntry)
 
 testModifySnapshotAttributeResponse :: ModifySnapshotAttributeResponse -> TestTree
 testModifySnapshotAttributeResponse = res
     "ModifySnapshotAttributeResponse"
-    "fixture/ModifySnapshotAttributeResponse"
+    "fixture/ModifySnapshotAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ModifySnapshotAttribute)
 
 testEnableVGWRoutePropagationResponse :: EnableVGWRoutePropagationResponse -> TestTree
 testEnableVGWRoutePropagationResponse = res
     "EnableVGWRoutePropagationResponse"
-    "fixture/EnableVGWRoutePropagationResponse"
+    "fixture/EnableVGWRoutePropagationResponse.proto"
     eC2
     (Proxy :: Proxy EnableVGWRoutePropagation)
 
 testCreateSnapshotResponse :: Snapshot -> TestTree
 testCreateSnapshotResponse = res
     "CreateSnapshotResponse"
-    "fixture/CreateSnapshotResponse"
+    "fixture/CreateSnapshotResponse.proto"
     eC2
     (Proxy :: Proxy CreateSnapshot)
 
 testDescribeSpotFleetRequestHistoryResponse :: DescribeSpotFleetRequestHistoryResponse -> TestTree
 testDescribeSpotFleetRequestHistoryResponse = res
     "DescribeSpotFleetRequestHistoryResponse"
-    "fixture/DescribeSpotFleetRequestHistoryResponse"
+    "fixture/DescribeSpotFleetRequestHistoryResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSpotFleetRequestHistory)
 
 testDeleteSpotDatafeedSubscriptionResponse :: DeleteSpotDatafeedSubscriptionResponse -> TestTree
 testDeleteSpotDatafeedSubscriptionResponse = res
     "DeleteSpotDatafeedSubscriptionResponse"
-    "fixture/DeleteSpotDatafeedSubscriptionResponse"
+    "fixture/DeleteSpotDatafeedSubscriptionResponse.proto"
     eC2
     (Proxy :: Proxy DeleteSpotDatafeedSubscription)
 
 testDescribePlacementGroupsResponse :: DescribePlacementGroupsResponse -> TestTree
 testDescribePlacementGroupsResponse = res
     "DescribePlacementGroupsResponse"
-    "fixture/DescribePlacementGroupsResponse"
+    "fixture/DescribePlacementGroupsResponse.proto"
     eC2
     (Proxy :: Proxy DescribePlacementGroups)
 
 testCreateReservedInstancesListingResponse :: CreateReservedInstancesListingResponse -> TestTree
 testCreateReservedInstancesListingResponse = res
     "CreateReservedInstancesListingResponse"
-    "fixture/CreateReservedInstancesListingResponse"
+    "fixture/CreateReservedInstancesListingResponse.proto"
     eC2
     (Proxy :: Proxy CreateReservedInstancesListing)
 
 testEnableVPCClassicLinkResponse :: EnableVPCClassicLinkResponse -> TestTree
 testEnableVPCClassicLinkResponse = res
     "EnableVPCClassicLinkResponse"
-    "fixture/EnableVPCClassicLinkResponse"
+    "fixture/EnableVPCClassicLinkResponse.proto"
     eC2
     (Proxy :: Proxy EnableVPCClassicLink)
 
 testDescribeKeyPairsResponse :: DescribeKeyPairsResponse -> TestTree
 testDescribeKeyPairsResponse = res
     "DescribeKeyPairsResponse"
-    "fixture/DescribeKeyPairsResponse"
+    "fixture/DescribeKeyPairsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeKeyPairs)
 
 testRebootInstancesResponse :: RebootInstancesResponse -> TestTree
 testRebootInstancesResponse = res
     "RebootInstancesResponse"
-    "fixture/RebootInstancesResponse"
+    "fixture/RebootInstancesResponse.proto"
     eC2
     (Proxy :: Proxy RebootInstances)
 
 testAttachVPNGatewayResponse :: AttachVPNGatewayResponse -> TestTree
 testAttachVPNGatewayResponse = res
     "AttachVPNGatewayResponse"
-    "fixture/AttachVPNGatewayResponse"
+    "fixture/AttachVPNGatewayResponse.proto"
     eC2
     (Proxy :: Proxy AttachVPNGateway)
 
 testCreateVPNConnectionRouteResponse :: CreateVPNConnectionRouteResponse -> TestTree
 testCreateVPNConnectionRouteResponse = res
     "CreateVPNConnectionRouteResponse"
-    "fixture/CreateVPNConnectionRouteResponse"
+    "fixture/CreateVPNConnectionRouteResponse.proto"
     eC2
     (Proxy :: Proxy CreateVPNConnectionRoute)
 
 testDescribeClassicLinkInstancesResponse :: DescribeClassicLinkInstancesResponse -> TestTree
 testDescribeClassicLinkInstancesResponse = res
     "DescribeClassicLinkInstancesResponse"
-    "fixture/DescribeClassicLinkInstancesResponse"
+    "fixture/DescribeClassicLinkInstancesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeClassicLinkInstances)
 
 testTerminateInstancesResponse :: TerminateInstancesResponse -> TestTree
 testTerminateInstancesResponse = res
     "TerminateInstancesResponse"
-    "fixture/TerminateInstancesResponse"
+    "fixture/TerminateInstancesResponse.proto"
     eC2
     (Proxy :: Proxy TerminateInstances)
 
 testCreateDHCPOptionsResponse :: CreateDHCPOptionsResponse -> TestTree
 testCreateDHCPOptionsResponse = res
     "CreateDHCPOptionsResponse"
-    "fixture/CreateDHCPOptionsResponse"
+    "fixture/CreateDHCPOptionsResponse.proto"
     eC2
     (Proxy :: Proxy CreateDHCPOptions)
 
 testAssociateRouteTableResponse :: AssociateRouteTableResponse -> TestTree
 testAssociateRouteTableResponse = res
     "AssociateRouteTableResponse"
-    "fixture/AssociateRouteTableResponse"
+    "fixture/AssociateRouteTableResponse.proto"
     eC2
     (Proxy :: Proxy AssociateRouteTable)
 
 testCreateImageResponse :: CreateImageResponse -> TestTree
 testCreateImageResponse = res
     "CreateImageResponse"
-    "fixture/CreateImageResponse"
+    "fixture/CreateImageResponse.proto"
     eC2
     (Proxy :: Proxy CreateImage)
 
 testDescribeAccountAttributesResponse :: DescribeAccountAttributesResponse -> TestTree
 testDescribeAccountAttributesResponse = res
     "DescribeAccountAttributesResponse"
-    "fixture/DescribeAccountAttributesResponse"
+    "fixture/DescribeAccountAttributesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeAccountAttributes)
 
 testResetImageAttributeResponse :: ResetImageAttributeResponse -> TestTree
 testResetImageAttributeResponse = res
     "ResetImageAttributeResponse"
-    "fixture/ResetImageAttributeResponse"
+    "fixture/ResetImageAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ResetImageAttribute)
 
 testDescribeNetworkACLsResponse :: DescribeNetworkACLsResponse -> TestTree
 testDescribeNetworkACLsResponse = res
     "DescribeNetworkACLsResponse"
-    "fixture/DescribeNetworkACLsResponse"
+    "fixture/DescribeNetworkACLsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeNetworkACLs)
 
 testCancelImportTaskResponse :: CancelImportTaskResponse -> TestTree
 testCancelImportTaskResponse = res
     "CancelImportTaskResponse"
-    "fixture/CancelImportTaskResponse"
+    "fixture/CancelImportTaskResponse.proto"
     eC2
     (Proxy :: Proxy CancelImportTask)
 
 testGetConsoleOutputResponse :: GetConsoleOutputResponse -> TestTree
 testGetConsoleOutputResponse = res
     "GetConsoleOutputResponse"
-    "fixture/GetConsoleOutputResponse"
+    "fixture/GetConsoleOutputResponse.proto"
     eC2
     (Proxy :: Proxy GetConsoleOutput)
 
 testUnassignPrivateIPAddressesResponse :: UnassignPrivateIPAddressesResponse -> TestTree
 testUnassignPrivateIPAddressesResponse = res
     "UnassignPrivateIPAddressesResponse"
-    "fixture/UnassignPrivateIPAddressesResponse"
+    "fixture/UnassignPrivateIPAddressesResponse.proto"
     eC2
     (Proxy :: Proxy UnassignPrivateIPAddresses)
 
 testDeleteRouteTableResponse :: DeleteRouteTableResponse -> TestTree
 testDeleteRouteTableResponse = res
     "DeleteRouteTableResponse"
-    "fixture/DeleteRouteTableResponse"
+    "fixture/DeleteRouteTableResponse.proto"
     eC2
     (Proxy :: Proxy DeleteRouteTable)
 
 testDescribeImageAttributeResponse :: DescribeImageAttributeResponse -> TestTree
 testDescribeImageAttributeResponse = res
     "DescribeImageAttributeResponse"
-    "fixture/DescribeImageAttributeResponse"
+    "fixture/DescribeImageAttributeResponse.proto"
     eC2
     (Proxy :: Proxy DescribeImageAttribute)
 
 testDeleteDHCPOptionsResponse :: DeleteDHCPOptionsResponse -> TestTree
 testDeleteDHCPOptionsResponse = res
     "DeleteDHCPOptionsResponse"
-    "fixture/DeleteDHCPOptionsResponse"
+    "fixture/DeleteDHCPOptionsResponse.proto"
     eC2
     (Proxy :: Proxy DeleteDHCPOptions)
 
 testDescribeVPNGatewaysResponse :: DescribeVPNGatewaysResponse -> TestTree
 testDescribeVPNGatewaysResponse = res
     "DescribeVPNGatewaysResponse"
-    "fixture/DescribeVPNGatewaysResponse"
+    "fixture/DescribeVPNGatewaysResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVPNGateways)
 
 testDetachClassicLinkVPCResponse :: DetachClassicLinkVPCResponse -> TestTree
 testDetachClassicLinkVPCResponse = res
     "DetachClassicLinkVPCResponse"
-    "fixture/DetachClassicLinkVPCResponse"
+    "fixture/DetachClassicLinkVPCResponse.proto"
     eC2
     (Proxy :: Proxy DetachClassicLinkVPC)
 
 testDescribeReservedInstancesModificationsResponse :: DescribeReservedInstancesModificationsResponse -> TestTree
 testDescribeReservedInstancesModificationsResponse = res
     "DescribeReservedInstancesModificationsResponse"
-    "fixture/DescribeReservedInstancesModificationsResponse"
+    "fixture/DescribeReservedInstancesModificationsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeReservedInstancesModifications)
 
 testDescribeSpotInstanceRequestsResponse :: DescribeSpotInstanceRequestsResponse -> TestTree
 testDescribeSpotInstanceRequestsResponse = res
     "DescribeSpotInstanceRequestsResponse"
-    "fixture/DescribeSpotInstanceRequestsResponse"
+    "fixture/DescribeSpotInstanceRequestsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSpotInstanceRequests)
 
 testMonitorInstancesResponse :: MonitorInstancesResponse -> TestTree
 testMonitorInstancesResponse = res
     "MonitorInstancesResponse"
-    "fixture/MonitorInstancesResponse"
+    "fixture/MonitorInstancesResponse.proto"
     eC2
     (Proxy :: Proxy MonitorInstances)
 
 testDescribeRegionsResponse :: DescribeRegionsResponse -> TestTree
 testDescribeRegionsResponse = res
     "DescribeRegionsResponse"
-    "fixture/DescribeRegionsResponse"
+    "fixture/DescribeRegionsResponse.proto"
     eC2
     (Proxy :: Proxy DescribeRegions)
 
 testModifyVPCAttributeResponse :: ModifyVPCAttributeResponse -> TestTree
 testModifyVPCAttributeResponse = res
     "ModifyVPCAttributeResponse"
-    "fixture/ModifyVPCAttributeResponse"
+    "fixture/ModifyVPCAttributeResponse.proto"
     eC2
     (Proxy :: Proxy ModifyVPCAttribute)
 
 testDescribeSpotFleetInstancesResponse :: DescribeSpotFleetInstancesResponse -> TestTree
 testDescribeSpotFleetInstancesResponse = res
     "DescribeSpotFleetInstancesResponse"
-    "fixture/DescribeSpotFleetInstancesResponse"
+    "fixture/DescribeSpotFleetInstancesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeSpotFleetInstances)
 
 testDescribeVolumeStatusResponse :: DescribeVolumeStatusResponse -> TestTree
 testDescribeVolumeStatusResponse = res
     "DescribeVolumeStatusResponse"
-    "fixture/DescribeVolumeStatusResponse"
+    "fixture/DescribeVolumeStatusResponse.proto"
     eC2
     (Proxy :: Proxy DescribeVolumeStatus)
 
 testDeleteVolumeResponse :: DeleteVolumeResponse -> TestTree
 testDeleteVolumeResponse = res
     "DeleteVolumeResponse"
-    "fixture/DeleteVolumeResponse"
+    "fixture/DeleteVolumeResponse.proto"
     eC2
     (Proxy :: Proxy DeleteVolume)
 
 testDescribeImagesResponse :: DescribeImagesResponse -> TestTree
 testDescribeImagesResponse = res
     "DescribeImagesResponse"
-    "fixture/DescribeImagesResponse"
+    "fixture/DescribeImagesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeImages)
 
 testCreateKeyPairResponse :: CreateKeyPairResponse -> TestTree
 testCreateKeyPairResponse = res
     "CreateKeyPairResponse"
-    "fixture/CreateKeyPairResponse"
+    "fixture/CreateKeyPairResponse.proto"
     eC2
     (Proxy :: Proxy CreateKeyPair)
 
 testRestoreAddressToClassicResponse :: RestoreAddressToClassicResponse -> TestTree
 testRestoreAddressToClassicResponse = res
     "RestoreAddressToClassicResponse"
-    "fixture/RestoreAddressToClassicResponse"
+    "fixture/RestoreAddressToClassicResponse.proto"
     eC2
     (Proxy :: Proxy RestoreAddressToClassic)
 
 testDescribeAvailabilityZonesResponse :: DescribeAvailabilityZonesResponse -> TestTree
 testDescribeAvailabilityZonesResponse = res
     "DescribeAvailabilityZonesResponse"
-    "fixture/DescribeAvailabilityZonesResponse"
+    "fixture/DescribeAvailabilityZonesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeAvailabilityZones)
 
 testImportSnapshotResponse :: ImportSnapshotResponse -> TestTree
 testImportSnapshotResponse = res
     "ImportSnapshotResponse"
-    "fixture/ImportSnapshotResponse"
+    "fixture/ImportSnapshotResponse.proto"
     eC2
     (Proxy :: Proxy ImportSnapshot)
 
 testAcceptVPCPeeringConnectionResponse :: AcceptVPCPeeringConnectionResponse -> TestTree
 testAcceptVPCPeeringConnectionResponse = res
     "AcceptVPCPeeringConnectionResponse"
-    "fixture/AcceptVPCPeeringConnectionResponse"
+    "fixture/AcceptVPCPeeringConnectionResponse.proto"
     eC2
     (Proxy :: Proxy AcceptVPCPeeringConnection)
 
 testDescribeRouteTablesResponse :: DescribeRouteTablesResponse -> TestTree
 testDescribeRouteTablesResponse = res
     "DescribeRouteTablesResponse"
-    "fixture/DescribeRouteTablesResponse"
+    "fixture/DescribeRouteTablesResponse.proto"
     eC2
     (Proxy :: Proxy DescribeRouteTables)
