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-storagegateway.cabal b/amazonka-storagegateway.cabal
--- a/amazonka-storagegateway.cabal
+++ b/amazonka-storagegateway.cabal
@@ -1,7 +1,8 @@
 name:                  amazonka-storagegateway
-version:               1.2.0.1
+version:               1.2.0.2
 synopsis:              Amazon Storage Gateway 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:
     AWS Storage Gateway Service
 
@@ -136,8 +136,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.StorageGateway
         , Test.AWS.Gen.StorageGateway
diff --git a/fixture/ActivateGateway.yaml b/fixture/ActivateGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ActivateGateway.yaml
diff --git a/fixture/ActivateGatewayResponse.proto b/fixture/ActivateGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ActivateGatewayResponse.proto
diff --git a/fixture/AddCache.yaml b/fixture/AddCache.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddCache.yaml
diff --git a/fixture/AddCacheResponse.proto b/fixture/AddCacheResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddCacheResponse.proto
diff --git a/fixture/AddUploadBuffer.yaml b/fixture/AddUploadBuffer.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddUploadBuffer.yaml
diff --git a/fixture/AddUploadBufferResponse.proto b/fixture/AddUploadBufferResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddUploadBufferResponse.proto
diff --git a/fixture/AddWorkingStorage.yaml b/fixture/AddWorkingStorage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddWorkingStorage.yaml
diff --git a/fixture/AddWorkingStorageResponse.proto b/fixture/AddWorkingStorageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddWorkingStorageResponse.proto
diff --git a/fixture/CancelArchival.yaml b/fixture/CancelArchival.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelArchival.yaml
diff --git a/fixture/CancelArchivalResponse.proto b/fixture/CancelArchivalResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelArchivalResponse.proto
diff --git a/fixture/CancelRetrieval.yaml b/fixture/CancelRetrieval.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CancelRetrieval.yaml
diff --git a/fixture/CancelRetrievalResponse.proto b/fixture/CancelRetrievalResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CancelRetrievalResponse.proto
diff --git a/fixture/CreateCachediSCSIVolume.yaml b/fixture/CreateCachediSCSIVolume.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCachediSCSIVolume.yaml
diff --git a/fixture/CreateCachediSCSIVolumeResponse.proto b/fixture/CreateCachediSCSIVolumeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateCachediSCSIVolumeResponse.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/CreateSnapshotFromVolumeRecoveryPoint.yaml b/fixture/CreateSnapshotFromVolumeRecoveryPoint.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotFromVolumeRecoveryPoint.yaml
diff --git a/fixture/CreateSnapshotFromVolumeRecoveryPointResponse.proto b/fixture/CreateSnapshotFromVolumeRecoveryPointResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotFromVolumeRecoveryPointResponse.proto
diff --git a/fixture/CreateSnapshotResponse.proto b/fixture/CreateSnapshotResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateSnapshotResponse.proto
diff --git a/fixture/CreateStorediSCSIVolume.yaml b/fixture/CreateStorediSCSIVolume.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateStorediSCSIVolume.yaml
diff --git a/fixture/CreateStorediSCSIVolumeResponse.proto b/fixture/CreateStorediSCSIVolumeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateStorediSCSIVolumeResponse.proto
diff --git a/fixture/CreateTapes.yaml b/fixture/CreateTapes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTapes.yaml
diff --git a/fixture/CreateTapesResponse.proto b/fixture/CreateTapesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateTapesResponse.proto
diff --git a/fixture/DeleteBandwidthRateLimit.yaml b/fixture/DeleteBandwidthRateLimit.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteBandwidthRateLimit.yaml
diff --git a/fixture/DeleteBandwidthRateLimitResponse.proto b/fixture/DeleteBandwidthRateLimitResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteBandwidthRateLimitResponse.proto
diff --git a/fixture/DeleteChapCredentials.yaml b/fixture/DeleteChapCredentials.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteChapCredentials.yaml
diff --git a/fixture/DeleteChapCredentialsResponse.proto b/fixture/DeleteChapCredentialsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteChapCredentialsResponse.proto
diff --git a/fixture/DeleteGateway.yaml b/fixture/DeleteGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteGateway.yaml
diff --git a/fixture/DeleteGatewayResponse.proto b/fixture/DeleteGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteGatewayResponse.proto
diff --git a/fixture/DeleteSnapshotSchedule.yaml b/fixture/DeleteSnapshotSchedule.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshotSchedule.yaml
diff --git a/fixture/DeleteSnapshotScheduleResponse.proto b/fixture/DeleteSnapshotScheduleResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteSnapshotScheduleResponse.proto
diff --git a/fixture/DeleteTape.yaml b/fixture/DeleteTape.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTape.yaml
diff --git a/fixture/DeleteTapeArchive.yaml b/fixture/DeleteTapeArchive.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTapeArchive.yaml
diff --git a/fixture/DeleteTapeArchiveResponse.proto b/fixture/DeleteTapeArchiveResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTapeArchiveResponse.proto
diff --git a/fixture/DeleteTapeResponse.proto b/fixture/DeleteTapeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteTapeResponse.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/DescribeBandwidthRateLimit.yaml b/fixture/DescribeBandwidthRateLimit.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeBandwidthRateLimit.yaml
diff --git a/fixture/DescribeBandwidthRateLimitResponse.proto b/fixture/DescribeBandwidthRateLimitResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeBandwidthRateLimitResponse.proto
diff --git a/fixture/DescribeCache.yaml b/fixture/DescribeCache.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCache.yaml
diff --git a/fixture/DescribeCacheResponse.proto b/fixture/DescribeCacheResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCacheResponse.proto
diff --git a/fixture/DescribeCachediSCSIVolumes.yaml b/fixture/DescribeCachediSCSIVolumes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCachediSCSIVolumes.yaml
diff --git a/fixture/DescribeCachediSCSIVolumesResponse.proto b/fixture/DescribeCachediSCSIVolumesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeCachediSCSIVolumesResponse.proto
diff --git a/fixture/DescribeChapCredentials.yaml b/fixture/DescribeChapCredentials.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeChapCredentials.yaml
diff --git a/fixture/DescribeChapCredentialsResponse.proto b/fixture/DescribeChapCredentialsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeChapCredentialsResponse.proto
diff --git a/fixture/DescribeGatewayInformation.yaml b/fixture/DescribeGatewayInformation.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeGatewayInformation.yaml
diff --git a/fixture/DescribeGatewayInformationResponse.proto b/fixture/DescribeGatewayInformationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeGatewayInformationResponse.proto
diff --git a/fixture/DescribeMaintenanceStartTime.yaml b/fixture/DescribeMaintenanceStartTime.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMaintenanceStartTime.yaml
diff --git a/fixture/DescribeMaintenanceStartTimeResponse.proto b/fixture/DescribeMaintenanceStartTimeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeMaintenanceStartTimeResponse.proto
diff --git a/fixture/DescribeSnapshotSchedule.yaml b/fixture/DescribeSnapshotSchedule.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotSchedule.yaml
diff --git a/fixture/DescribeSnapshotScheduleResponse.proto b/fixture/DescribeSnapshotScheduleResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeSnapshotScheduleResponse.proto
diff --git a/fixture/DescribeStorediSCSIVolumes.yaml b/fixture/DescribeStorediSCSIVolumes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStorediSCSIVolumes.yaml
diff --git a/fixture/DescribeStorediSCSIVolumesResponse.proto b/fixture/DescribeStorediSCSIVolumesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeStorediSCSIVolumesResponse.proto
diff --git a/fixture/DescribeTapeArchives.yaml b/fixture/DescribeTapeArchives.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTapeArchives.yaml
diff --git a/fixture/DescribeTapeArchivesResponse.proto b/fixture/DescribeTapeArchivesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTapeArchivesResponse.proto
diff --git a/fixture/DescribeTapeRecoveryPoints.yaml b/fixture/DescribeTapeRecoveryPoints.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTapeRecoveryPoints.yaml
diff --git a/fixture/DescribeTapeRecoveryPointsResponse.proto b/fixture/DescribeTapeRecoveryPointsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTapeRecoveryPointsResponse.proto
diff --git a/fixture/DescribeTapes.yaml b/fixture/DescribeTapes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTapes.yaml
diff --git a/fixture/DescribeTapesResponse.proto b/fixture/DescribeTapesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeTapesResponse.proto
diff --git a/fixture/DescribeUploadBuffer.yaml b/fixture/DescribeUploadBuffer.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeUploadBuffer.yaml
diff --git a/fixture/DescribeUploadBufferResponse.proto b/fixture/DescribeUploadBufferResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeUploadBufferResponse.proto
diff --git a/fixture/DescribeVTLDevices.yaml b/fixture/DescribeVTLDevices.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVTLDevices.yaml
diff --git a/fixture/DescribeVTLDevicesResponse.proto b/fixture/DescribeVTLDevicesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeVTLDevicesResponse.proto
diff --git a/fixture/DescribeWorkingStorage.yaml b/fixture/DescribeWorkingStorage.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeWorkingStorage.yaml
diff --git a/fixture/DescribeWorkingStorageResponse.proto b/fixture/DescribeWorkingStorageResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeWorkingStorageResponse.proto
diff --git a/fixture/DisableGateway.yaml b/fixture/DisableGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DisableGateway.yaml
diff --git a/fixture/DisableGatewayResponse.proto b/fixture/DisableGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DisableGatewayResponse.proto
diff --git a/fixture/ListGateways.yaml b/fixture/ListGateways.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListGateways.yaml
diff --git a/fixture/ListGatewaysResponse.proto b/fixture/ListGatewaysResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListGatewaysResponse.proto
diff --git a/fixture/ListLocalDisks.yaml b/fixture/ListLocalDisks.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListLocalDisks.yaml
diff --git a/fixture/ListLocalDisksResponse.proto b/fixture/ListLocalDisksResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListLocalDisksResponse.proto
diff --git a/fixture/ListVolumeInitiators.yaml b/fixture/ListVolumeInitiators.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListVolumeInitiators.yaml
diff --git a/fixture/ListVolumeInitiatorsResponse.proto b/fixture/ListVolumeInitiatorsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListVolumeInitiatorsResponse.proto
diff --git a/fixture/ListVolumeRecoveryPoints.yaml b/fixture/ListVolumeRecoveryPoints.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListVolumeRecoveryPoints.yaml
diff --git a/fixture/ListVolumeRecoveryPointsResponse.proto b/fixture/ListVolumeRecoveryPointsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListVolumeRecoveryPointsResponse.proto
diff --git a/fixture/ListVolumes.yaml b/fixture/ListVolumes.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListVolumes.yaml
diff --git a/fixture/ListVolumesResponse.proto b/fixture/ListVolumesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListVolumesResponse.proto
diff --git a/fixture/ResetCache.yaml b/fixture/ResetCache.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ResetCache.yaml
diff --git a/fixture/ResetCacheResponse.proto b/fixture/ResetCacheResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ResetCacheResponse.proto
diff --git a/fixture/RetrieveTapeArchive.yaml b/fixture/RetrieveTapeArchive.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RetrieveTapeArchive.yaml
diff --git a/fixture/RetrieveTapeArchiveResponse.proto b/fixture/RetrieveTapeArchiveResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RetrieveTapeArchiveResponse.proto
diff --git a/fixture/RetrieveTapeRecoveryPoint.yaml b/fixture/RetrieveTapeRecoveryPoint.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RetrieveTapeRecoveryPoint.yaml
diff --git a/fixture/RetrieveTapeRecoveryPointResponse.proto b/fixture/RetrieveTapeRecoveryPointResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RetrieveTapeRecoveryPointResponse.proto
diff --git a/fixture/ShutdownGateway.yaml b/fixture/ShutdownGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ShutdownGateway.yaml
diff --git a/fixture/ShutdownGatewayResponse.proto b/fixture/ShutdownGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ShutdownGatewayResponse.proto
diff --git a/fixture/StartGateway.yaml b/fixture/StartGateway.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/StartGateway.yaml
diff --git a/fixture/StartGatewayResponse.proto b/fixture/StartGatewayResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/StartGatewayResponse.proto
diff --git a/fixture/UpdateBandwidthRateLimit.yaml b/fixture/UpdateBandwidthRateLimit.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateBandwidthRateLimit.yaml
diff --git a/fixture/UpdateBandwidthRateLimitResponse.proto b/fixture/UpdateBandwidthRateLimitResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateBandwidthRateLimitResponse.proto
diff --git a/fixture/UpdateChapCredentials.yaml b/fixture/UpdateChapCredentials.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateChapCredentials.yaml
diff --git a/fixture/UpdateChapCredentialsResponse.proto b/fixture/UpdateChapCredentialsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateChapCredentialsResponse.proto
diff --git a/fixture/UpdateGatewayInformation.yaml b/fixture/UpdateGatewayInformation.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateGatewayInformation.yaml
diff --git a/fixture/UpdateGatewayInformationResponse.proto b/fixture/UpdateGatewayInformationResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateGatewayInformationResponse.proto
diff --git a/fixture/UpdateGatewaySoftwareNow.yaml b/fixture/UpdateGatewaySoftwareNow.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateGatewaySoftwareNow.yaml
diff --git a/fixture/UpdateGatewaySoftwareNowResponse.proto b/fixture/UpdateGatewaySoftwareNowResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateGatewaySoftwareNowResponse.proto
diff --git a/fixture/UpdateMaintenanceStartTime.yaml b/fixture/UpdateMaintenanceStartTime.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateMaintenanceStartTime.yaml
diff --git a/fixture/UpdateMaintenanceStartTimeResponse.proto b/fixture/UpdateMaintenanceStartTimeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateMaintenanceStartTimeResponse.proto
diff --git a/fixture/UpdateSnapshotSchedule.yaml b/fixture/UpdateSnapshotSchedule.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateSnapshotSchedule.yaml
diff --git a/fixture/UpdateSnapshotScheduleResponse.proto b/fixture/UpdateSnapshotScheduleResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateSnapshotScheduleResponse.proto
diff --git a/fixture/UpdateVTLDeviceType.yaml b/fixture/UpdateVTLDeviceType.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateVTLDeviceType.yaml
diff --git a/fixture/UpdateVTLDeviceTypeResponse.proto b/fixture/UpdateVTLDeviceTypeResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateVTLDeviceTypeResponse.proto
diff --git a/test/Test/AWS/Gen/StorageGateway.hs b/test/Test/AWS/Gen/StorageGateway.hs
--- a/test/Test/AWS/Gen/StorageGateway.hs
+++ b/test/Test/AWS/Gen/StorageGateway.hs
@@ -339,601 +339,601 @@
 testCancelArchival :: CancelArchival -> TestTree
 testCancelArchival = req
     "CancelArchival"
-    "fixture/CancelArchival"
+    "fixture/CancelArchival.yaml"
 
 testCreateStorediSCSIVolume :: CreateStorediSCSIVolume -> TestTree
 testCreateStorediSCSIVolume = req
     "CreateStorediSCSIVolume"
-    "fixture/CreateStorediSCSIVolume"
+    "fixture/CreateStorediSCSIVolume.yaml"
 
 testCreateTapes :: CreateTapes -> TestTree
 testCreateTapes = req
     "CreateTapes"
-    "fixture/CreateTapes"
+    "fixture/CreateTapes.yaml"
 
 testCreateCachediSCSIVolume :: CreateCachediSCSIVolume -> TestTree
 testCreateCachediSCSIVolume = req
     "CreateCachediSCSIVolume"
-    "fixture/CreateCachediSCSIVolume"
+    "fixture/CreateCachediSCSIVolume.yaml"
 
 testUpdateVTLDeviceType :: UpdateVTLDeviceType -> TestTree
 testUpdateVTLDeviceType = req
     "UpdateVTLDeviceType"
-    "fixture/UpdateVTLDeviceType"
+    "fixture/UpdateVTLDeviceType.yaml"
 
 testDescribeChapCredentials :: DescribeChapCredentials -> TestTree
 testDescribeChapCredentials = req
     "DescribeChapCredentials"
-    "fixture/DescribeChapCredentials"
+    "fixture/DescribeChapCredentials.yaml"
 
 testAddUploadBuffer :: AddUploadBuffer -> TestTree
 testAddUploadBuffer = req
     "AddUploadBuffer"
-    "fixture/AddUploadBuffer"
+    "fixture/AddUploadBuffer.yaml"
 
 testListVolumeInitiators :: ListVolumeInitiators -> TestTree
 testListVolumeInitiators = req
     "ListVolumeInitiators"
-    "fixture/ListVolumeInitiators"
+    "fixture/ListVolumeInitiators.yaml"
 
 testDescribeWorkingStorage :: DescribeWorkingStorage -> TestTree
 testDescribeWorkingStorage = req
     "DescribeWorkingStorage"
-    "fixture/DescribeWorkingStorage"
+    "fixture/DescribeWorkingStorage.yaml"
 
 testDescribeCachediSCSIVolumes :: DescribeCachediSCSIVolumes -> TestTree
 testDescribeCachediSCSIVolumes = req
     "DescribeCachediSCSIVolumes"
-    "fixture/DescribeCachediSCSIVolumes"
+    "fixture/DescribeCachediSCSIVolumes.yaml"
 
 testUpdateGatewayInformation :: UpdateGatewayInformation -> TestTree
 testUpdateGatewayInformation = req
     "UpdateGatewayInformation"
-    "fixture/UpdateGatewayInformation"
+    "fixture/UpdateGatewayInformation.yaml"
 
 testDescribeMaintenanceStartTime :: DescribeMaintenanceStartTime -> TestTree
 testDescribeMaintenanceStartTime = req
     "DescribeMaintenanceStartTime"
-    "fixture/DescribeMaintenanceStartTime"
+    "fixture/DescribeMaintenanceStartTime.yaml"
 
 testAddCache :: AddCache -> TestTree
 testAddCache = req
     "AddCache"
-    "fixture/AddCache"
+    "fixture/AddCache.yaml"
 
 testStartGateway :: StartGateway -> TestTree
 testStartGateway = req
     "StartGateway"
-    "fixture/StartGateway"
+    "fixture/StartGateway.yaml"
 
 testShutdownGateway :: ShutdownGateway -> TestTree
 testShutdownGateway = req
     "ShutdownGateway"
-    "fixture/ShutdownGateway"
+    "fixture/ShutdownGateway.yaml"
 
 testUpdateGatewaySoftwareNow :: UpdateGatewaySoftwareNow -> TestTree
 testUpdateGatewaySoftwareNow = req
     "UpdateGatewaySoftwareNow"
-    "fixture/UpdateGatewaySoftwareNow"
+    "fixture/UpdateGatewaySoftwareNow.yaml"
 
 testDeleteChapCredentials :: DeleteChapCredentials -> TestTree
 testDeleteChapCredentials = req
     "DeleteChapCredentials"
-    "fixture/DeleteChapCredentials"
+    "fixture/DeleteChapCredentials.yaml"
 
 testUpdateChapCredentials :: UpdateChapCredentials -> TestTree
 testUpdateChapCredentials = req
     "UpdateChapCredentials"
-    "fixture/UpdateChapCredentials"
+    "fixture/UpdateChapCredentials.yaml"
 
 testDescribeStorediSCSIVolumes :: DescribeStorediSCSIVolumes -> TestTree
 testDescribeStorediSCSIVolumes = req
     "DescribeStorediSCSIVolumes"
-    "fixture/DescribeStorediSCSIVolumes"
+    "fixture/DescribeStorediSCSIVolumes.yaml"
 
 testDescribeTapes :: DescribeTapes -> TestTree
 testDescribeTapes = req
     "DescribeTapes"
-    "fixture/DescribeTapes"
+    "fixture/DescribeTapes.yaml"
 
 testDescribeUploadBuffer :: DescribeUploadBuffer -> TestTree
 testDescribeUploadBuffer = req
     "DescribeUploadBuffer"
-    "fixture/DescribeUploadBuffer"
+    "fixture/DescribeUploadBuffer.yaml"
 
 testCreateSnapshotFromVolumeRecoveryPoint :: CreateSnapshotFromVolumeRecoveryPoint -> TestTree
 testCreateSnapshotFromVolumeRecoveryPoint = req
     "CreateSnapshotFromVolumeRecoveryPoint"
-    "fixture/CreateSnapshotFromVolumeRecoveryPoint"
+    "fixture/CreateSnapshotFromVolumeRecoveryPoint.yaml"
 
 testDescribeGatewayInformation :: DescribeGatewayInformation -> TestTree
 testDescribeGatewayInformation = req
     "DescribeGatewayInformation"
-    "fixture/DescribeGatewayInformation"
+    "fixture/DescribeGatewayInformation.yaml"
 
 testRetrieveTapeRecoveryPoint :: RetrieveTapeRecoveryPoint -> TestTree
 testRetrieveTapeRecoveryPoint = req
     "RetrieveTapeRecoveryPoint"
-    "fixture/RetrieveTapeRecoveryPoint"
+    "fixture/RetrieveTapeRecoveryPoint.yaml"
 
 testUpdateMaintenanceStartTime :: UpdateMaintenanceStartTime -> TestTree
 testUpdateMaintenanceStartTime = req
     "UpdateMaintenanceStartTime"
-    "fixture/UpdateMaintenanceStartTime"
+    "fixture/UpdateMaintenanceStartTime.yaml"
 
 testDeleteGateway :: DeleteGateway -> TestTree
 testDeleteGateway = req
     "DeleteGateway"
-    "fixture/DeleteGateway"
+    "fixture/DeleteGateway.yaml"
 
 testDisableGateway :: DisableGateway -> TestTree
 testDisableGateway = req
     "DisableGateway"
-    "fixture/DisableGateway"
+    "fixture/DisableGateway.yaml"
 
 testDescribeSnapshotSchedule :: DescribeSnapshotSchedule -> TestTree
 testDescribeSnapshotSchedule = req
     "DescribeSnapshotSchedule"
-    "fixture/DescribeSnapshotSchedule"
+    "fixture/DescribeSnapshotSchedule.yaml"
 
 testDescribeTapeArchives :: DescribeTapeArchives -> TestTree
 testDescribeTapeArchives = req
     "DescribeTapeArchives"
-    "fixture/DescribeTapeArchives"
+    "fixture/DescribeTapeArchives.yaml"
 
 testRetrieveTapeArchive :: RetrieveTapeArchive -> TestTree
 testRetrieveTapeArchive = req
     "RetrieveTapeArchive"
-    "fixture/RetrieveTapeArchive"
+    "fixture/RetrieveTapeArchive.yaml"
 
 testDescribeBandwidthRateLimit :: DescribeBandwidthRateLimit -> TestTree
 testDescribeBandwidthRateLimit = req
     "DescribeBandwidthRateLimit"
-    "fixture/DescribeBandwidthRateLimit"
+    "fixture/DescribeBandwidthRateLimit.yaml"
 
 testDescribeVTLDevices :: DescribeVTLDevices -> TestTree
 testDescribeVTLDevices = req
     "DescribeVTLDevices"
-    "fixture/DescribeVTLDevices"
+    "fixture/DescribeVTLDevices.yaml"
 
 testCreateSnapshot :: CreateSnapshot -> TestTree
 testCreateSnapshot = req
     "CreateSnapshot"
-    "fixture/CreateSnapshot"
+    "fixture/CreateSnapshot.yaml"
 
 testUpdateSnapshotSchedule :: UpdateSnapshotSchedule -> TestTree
 testUpdateSnapshotSchedule = req
     "UpdateSnapshotSchedule"
-    "fixture/UpdateSnapshotSchedule"
+    "fixture/UpdateSnapshotSchedule.yaml"
 
 testCancelRetrieval :: CancelRetrieval -> TestTree
 testCancelRetrieval = req
     "CancelRetrieval"
-    "fixture/CancelRetrieval"
+    "fixture/CancelRetrieval.yaml"
 
 testDeleteSnapshotSchedule :: DeleteSnapshotSchedule -> TestTree
 testDeleteSnapshotSchedule = req
     "DeleteSnapshotSchedule"
-    "fixture/DeleteSnapshotSchedule"
+    "fixture/DeleteSnapshotSchedule.yaml"
 
 testDeleteTapeArchive :: DeleteTapeArchive -> TestTree
 testDeleteTapeArchive = req
     "DeleteTapeArchive"
-    "fixture/DeleteTapeArchive"
+    "fixture/DeleteTapeArchive.yaml"
 
 testListVolumeRecoveryPoints :: ListVolumeRecoveryPoints -> TestTree
 testListVolumeRecoveryPoints = req
     "ListVolumeRecoveryPoints"
-    "fixture/ListVolumeRecoveryPoints"
+    "fixture/ListVolumeRecoveryPoints.yaml"
 
 testAddWorkingStorage :: AddWorkingStorage -> TestTree
 testAddWorkingStorage = req
     "AddWorkingStorage"
-    "fixture/AddWorkingStorage"
+    "fixture/AddWorkingStorage.yaml"
 
 testListGateways :: ListGateways -> TestTree
 testListGateways = req
     "ListGateways"
-    "fixture/ListGateways"
+    "fixture/ListGateways.yaml"
 
 testListVolumes :: ListVolumes -> TestTree
 testListVolumes = req
     "ListVolumes"
-    "fixture/ListVolumes"
+    "fixture/ListVolumes.yaml"
 
 testDescribeTapeRecoveryPoints :: DescribeTapeRecoveryPoints -> TestTree
 testDescribeTapeRecoveryPoints = req
     "DescribeTapeRecoveryPoints"
-    "fixture/DescribeTapeRecoveryPoints"
+    "fixture/DescribeTapeRecoveryPoints.yaml"
 
 testDeleteVolume :: DeleteVolume -> TestTree
 testDeleteVolume = req
     "DeleteVolume"
-    "fixture/DeleteVolume"
+    "fixture/DeleteVolume.yaml"
 
 testResetCache :: ResetCache -> TestTree
 testResetCache = req
     "ResetCache"
-    "fixture/ResetCache"
+    "fixture/ResetCache.yaml"
 
 testActivateGateway :: ActivateGateway -> TestTree
 testActivateGateway = req
     "ActivateGateway"
-    "fixture/ActivateGateway"
+    "fixture/ActivateGateway.yaml"
 
 testDescribeCache :: DescribeCache -> TestTree
 testDescribeCache = req
     "DescribeCache"
-    "fixture/DescribeCache"
+    "fixture/DescribeCache.yaml"
 
 testUpdateBandwidthRateLimit :: UpdateBandwidthRateLimit -> TestTree
 testUpdateBandwidthRateLimit = req
     "UpdateBandwidthRateLimit"
-    "fixture/UpdateBandwidthRateLimit"
+    "fixture/UpdateBandwidthRateLimit.yaml"
 
 testDeleteBandwidthRateLimit :: DeleteBandwidthRateLimit -> TestTree
 testDeleteBandwidthRateLimit = req
     "DeleteBandwidthRateLimit"
-    "fixture/DeleteBandwidthRateLimit"
+    "fixture/DeleteBandwidthRateLimit.yaml"
 
 testListLocalDisks :: ListLocalDisks -> TestTree
 testListLocalDisks = req
     "ListLocalDisks"
-    "fixture/ListLocalDisks"
+    "fixture/ListLocalDisks.yaml"
 
 testDeleteTape :: DeleteTape -> TestTree
 testDeleteTape = req
     "DeleteTape"
-    "fixture/DeleteTape"
+    "fixture/DeleteTape.yaml"
 
 -- Responses
 
 testCancelArchivalResponse :: CancelArchivalResponse -> TestTree
 testCancelArchivalResponse = res
     "CancelArchivalResponse"
-    "fixture/CancelArchivalResponse"
+    "fixture/CancelArchivalResponse.proto"
     storageGateway
     (Proxy :: Proxy CancelArchival)
 
 testCreateStorediSCSIVolumeResponse :: CreateStorediSCSIVolumeResponse -> TestTree
 testCreateStorediSCSIVolumeResponse = res
     "CreateStorediSCSIVolumeResponse"
-    "fixture/CreateStorediSCSIVolumeResponse"
+    "fixture/CreateStorediSCSIVolumeResponse.proto"
     storageGateway
     (Proxy :: Proxy CreateStorediSCSIVolume)
 
 testCreateTapesResponse :: CreateTapesResponse -> TestTree
 testCreateTapesResponse = res
     "CreateTapesResponse"
-    "fixture/CreateTapesResponse"
+    "fixture/CreateTapesResponse.proto"
     storageGateway
     (Proxy :: Proxy CreateTapes)
 
 testCreateCachediSCSIVolumeResponse :: CreateCachediSCSIVolumeResponse -> TestTree
 testCreateCachediSCSIVolumeResponse = res
     "CreateCachediSCSIVolumeResponse"
-    "fixture/CreateCachediSCSIVolumeResponse"
+    "fixture/CreateCachediSCSIVolumeResponse.proto"
     storageGateway
     (Proxy :: Proxy CreateCachediSCSIVolume)
 
 testUpdateVTLDeviceTypeResponse :: UpdateVTLDeviceTypeResponse -> TestTree
 testUpdateVTLDeviceTypeResponse = res
     "UpdateVTLDeviceTypeResponse"
-    "fixture/UpdateVTLDeviceTypeResponse"
+    "fixture/UpdateVTLDeviceTypeResponse.proto"
     storageGateway
     (Proxy :: Proxy UpdateVTLDeviceType)
 
 testDescribeChapCredentialsResponse :: DescribeChapCredentialsResponse -> TestTree
 testDescribeChapCredentialsResponse = res
     "DescribeChapCredentialsResponse"
-    "fixture/DescribeChapCredentialsResponse"
+    "fixture/DescribeChapCredentialsResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeChapCredentials)
 
 testAddUploadBufferResponse :: AddUploadBufferResponse -> TestTree
 testAddUploadBufferResponse = res
     "AddUploadBufferResponse"
-    "fixture/AddUploadBufferResponse"
+    "fixture/AddUploadBufferResponse.proto"
     storageGateway
     (Proxy :: Proxy AddUploadBuffer)
 
 testListVolumeInitiatorsResponse :: ListVolumeInitiatorsResponse -> TestTree
 testListVolumeInitiatorsResponse = res
     "ListVolumeInitiatorsResponse"
-    "fixture/ListVolumeInitiatorsResponse"
+    "fixture/ListVolumeInitiatorsResponse.proto"
     storageGateway
     (Proxy :: Proxy ListVolumeInitiators)
 
 testDescribeWorkingStorageResponse :: DescribeWorkingStorageResponse -> TestTree
 testDescribeWorkingStorageResponse = res
     "DescribeWorkingStorageResponse"
-    "fixture/DescribeWorkingStorageResponse"
+    "fixture/DescribeWorkingStorageResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeWorkingStorage)
 
 testDescribeCachediSCSIVolumesResponse :: DescribeCachediSCSIVolumesResponse -> TestTree
 testDescribeCachediSCSIVolumesResponse = res
     "DescribeCachediSCSIVolumesResponse"
-    "fixture/DescribeCachediSCSIVolumesResponse"
+    "fixture/DescribeCachediSCSIVolumesResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeCachediSCSIVolumes)
 
 testUpdateGatewayInformationResponse :: UpdateGatewayInformationResponse -> TestTree
 testUpdateGatewayInformationResponse = res
     "UpdateGatewayInformationResponse"
-    "fixture/UpdateGatewayInformationResponse"
+    "fixture/UpdateGatewayInformationResponse.proto"
     storageGateway
     (Proxy :: Proxy UpdateGatewayInformation)
 
 testDescribeMaintenanceStartTimeResponse :: DescribeMaintenanceStartTimeResponse -> TestTree
 testDescribeMaintenanceStartTimeResponse = res
     "DescribeMaintenanceStartTimeResponse"
-    "fixture/DescribeMaintenanceStartTimeResponse"
+    "fixture/DescribeMaintenanceStartTimeResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeMaintenanceStartTime)
 
 testAddCacheResponse :: AddCacheResponse -> TestTree
 testAddCacheResponse = res
     "AddCacheResponse"
-    "fixture/AddCacheResponse"
+    "fixture/AddCacheResponse.proto"
     storageGateway
     (Proxy :: Proxy AddCache)
 
 testStartGatewayResponse :: StartGatewayResponse -> TestTree
 testStartGatewayResponse = res
     "StartGatewayResponse"
-    "fixture/StartGatewayResponse"
+    "fixture/StartGatewayResponse.proto"
     storageGateway
     (Proxy :: Proxy StartGateway)
 
 testShutdownGatewayResponse :: ShutdownGatewayResponse -> TestTree
 testShutdownGatewayResponse = res
     "ShutdownGatewayResponse"
-    "fixture/ShutdownGatewayResponse"
+    "fixture/ShutdownGatewayResponse.proto"
     storageGateway
     (Proxy :: Proxy ShutdownGateway)
 
 testUpdateGatewaySoftwareNowResponse :: UpdateGatewaySoftwareNowResponse -> TestTree
 testUpdateGatewaySoftwareNowResponse = res
     "UpdateGatewaySoftwareNowResponse"
-    "fixture/UpdateGatewaySoftwareNowResponse"
+    "fixture/UpdateGatewaySoftwareNowResponse.proto"
     storageGateway
     (Proxy :: Proxy UpdateGatewaySoftwareNow)
 
 testDeleteChapCredentialsResponse :: DeleteChapCredentialsResponse -> TestTree
 testDeleteChapCredentialsResponse = res
     "DeleteChapCredentialsResponse"
-    "fixture/DeleteChapCredentialsResponse"
+    "fixture/DeleteChapCredentialsResponse.proto"
     storageGateway
     (Proxy :: Proxy DeleteChapCredentials)
 
 testUpdateChapCredentialsResponse :: UpdateChapCredentialsResponse -> TestTree
 testUpdateChapCredentialsResponse = res
     "UpdateChapCredentialsResponse"
-    "fixture/UpdateChapCredentialsResponse"
+    "fixture/UpdateChapCredentialsResponse.proto"
     storageGateway
     (Proxy :: Proxy UpdateChapCredentials)
 
 testDescribeStorediSCSIVolumesResponse :: DescribeStorediSCSIVolumesResponse -> TestTree
 testDescribeStorediSCSIVolumesResponse = res
     "DescribeStorediSCSIVolumesResponse"
-    "fixture/DescribeStorediSCSIVolumesResponse"
+    "fixture/DescribeStorediSCSIVolumesResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeStorediSCSIVolumes)
 
 testDescribeTapesResponse :: DescribeTapesResponse -> TestTree
 testDescribeTapesResponse = res
     "DescribeTapesResponse"
-    "fixture/DescribeTapesResponse"
+    "fixture/DescribeTapesResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeTapes)
 
 testDescribeUploadBufferResponse :: DescribeUploadBufferResponse -> TestTree
 testDescribeUploadBufferResponse = res
     "DescribeUploadBufferResponse"
-    "fixture/DescribeUploadBufferResponse"
+    "fixture/DescribeUploadBufferResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeUploadBuffer)
 
 testCreateSnapshotFromVolumeRecoveryPointResponse :: CreateSnapshotFromVolumeRecoveryPointResponse -> TestTree
 testCreateSnapshotFromVolumeRecoveryPointResponse = res
     "CreateSnapshotFromVolumeRecoveryPointResponse"
-    "fixture/CreateSnapshotFromVolumeRecoveryPointResponse"
+    "fixture/CreateSnapshotFromVolumeRecoveryPointResponse.proto"
     storageGateway
     (Proxy :: Proxy CreateSnapshotFromVolumeRecoveryPoint)
 
 testDescribeGatewayInformationResponse :: DescribeGatewayInformationResponse -> TestTree
 testDescribeGatewayInformationResponse = res
     "DescribeGatewayInformationResponse"
-    "fixture/DescribeGatewayInformationResponse"
+    "fixture/DescribeGatewayInformationResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeGatewayInformation)
 
 testRetrieveTapeRecoveryPointResponse :: RetrieveTapeRecoveryPointResponse -> TestTree
 testRetrieveTapeRecoveryPointResponse = res
     "RetrieveTapeRecoveryPointResponse"
-    "fixture/RetrieveTapeRecoveryPointResponse"
+    "fixture/RetrieveTapeRecoveryPointResponse.proto"
     storageGateway
     (Proxy :: Proxy RetrieveTapeRecoveryPoint)
 
 testUpdateMaintenanceStartTimeResponse :: UpdateMaintenanceStartTimeResponse -> TestTree
 testUpdateMaintenanceStartTimeResponse = res
     "UpdateMaintenanceStartTimeResponse"
-    "fixture/UpdateMaintenanceStartTimeResponse"
+    "fixture/UpdateMaintenanceStartTimeResponse.proto"
     storageGateway
     (Proxy :: Proxy UpdateMaintenanceStartTime)
 
 testDeleteGatewayResponse :: DeleteGatewayResponse -> TestTree
 testDeleteGatewayResponse = res
     "DeleteGatewayResponse"
-    "fixture/DeleteGatewayResponse"
+    "fixture/DeleteGatewayResponse.proto"
     storageGateway
     (Proxy :: Proxy DeleteGateway)
 
 testDisableGatewayResponse :: DisableGatewayResponse -> TestTree
 testDisableGatewayResponse = res
     "DisableGatewayResponse"
-    "fixture/DisableGatewayResponse"
+    "fixture/DisableGatewayResponse.proto"
     storageGateway
     (Proxy :: Proxy DisableGateway)
 
 testDescribeSnapshotScheduleResponse :: DescribeSnapshotScheduleResponse -> TestTree
 testDescribeSnapshotScheduleResponse = res
     "DescribeSnapshotScheduleResponse"
-    "fixture/DescribeSnapshotScheduleResponse"
+    "fixture/DescribeSnapshotScheduleResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeSnapshotSchedule)
 
 testDescribeTapeArchivesResponse :: DescribeTapeArchivesResponse -> TestTree
 testDescribeTapeArchivesResponse = res
     "DescribeTapeArchivesResponse"
-    "fixture/DescribeTapeArchivesResponse"
+    "fixture/DescribeTapeArchivesResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeTapeArchives)
 
 testRetrieveTapeArchiveResponse :: RetrieveTapeArchiveResponse -> TestTree
 testRetrieveTapeArchiveResponse = res
     "RetrieveTapeArchiveResponse"
-    "fixture/RetrieveTapeArchiveResponse"
+    "fixture/RetrieveTapeArchiveResponse.proto"
     storageGateway
     (Proxy :: Proxy RetrieveTapeArchive)
 
 testDescribeBandwidthRateLimitResponse :: DescribeBandwidthRateLimitResponse -> TestTree
 testDescribeBandwidthRateLimitResponse = res
     "DescribeBandwidthRateLimitResponse"
-    "fixture/DescribeBandwidthRateLimitResponse"
+    "fixture/DescribeBandwidthRateLimitResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeBandwidthRateLimit)
 
 testDescribeVTLDevicesResponse :: DescribeVTLDevicesResponse -> TestTree
 testDescribeVTLDevicesResponse = res
     "DescribeVTLDevicesResponse"
-    "fixture/DescribeVTLDevicesResponse"
+    "fixture/DescribeVTLDevicesResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeVTLDevices)
 
 testCreateSnapshotResponse :: CreateSnapshotResponse -> TestTree
 testCreateSnapshotResponse = res
     "CreateSnapshotResponse"
-    "fixture/CreateSnapshotResponse"
+    "fixture/CreateSnapshotResponse.proto"
     storageGateway
     (Proxy :: Proxy CreateSnapshot)
 
 testUpdateSnapshotScheduleResponse :: UpdateSnapshotScheduleResponse -> TestTree
 testUpdateSnapshotScheduleResponse = res
     "UpdateSnapshotScheduleResponse"
-    "fixture/UpdateSnapshotScheduleResponse"
+    "fixture/UpdateSnapshotScheduleResponse.proto"
     storageGateway
     (Proxy :: Proxy UpdateSnapshotSchedule)
 
 testCancelRetrievalResponse :: CancelRetrievalResponse -> TestTree
 testCancelRetrievalResponse = res
     "CancelRetrievalResponse"
-    "fixture/CancelRetrievalResponse"
+    "fixture/CancelRetrievalResponse.proto"
     storageGateway
     (Proxy :: Proxy CancelRetrieval)
 
 testDeleteSnapshotScheduleResponse :: DeleteSnapshotScheduleResponse -> TestTree
 testDeleteSnapshotScheduleResponse = res
     "DeleteSnapshotScheduleResponse"
-    "fixture/DeleteSnapshotScheduleResponse"
+    "fixture/DeleteSnapshotScheduleResponse.proto"
     storageGateway
     (Proxy :: Proxy DeleteSnapshotSchedule)
 
 testDeleteTapeArchiveResponse :: DeleteTapeArchiveResponse -> TestTree
 testDeleteTapeArchiveResponse = res
     "DeleteTapeArchiveResponse"
-    "fixture/DeleteTapeArchiveResponse"
+    "fixture/DeleteTapeArchiveResponse.proto"
     storageGateway
     (Proxy :: Proxy DeleteTapeArchive)
 
 testListVolumeRecoveryPointsResponse :: ListVolumeRecoveryPointsResponse -> TestTree
 testListVolumeRecoveryPointsResponse = res
     "ListVolumeRecoveryPointsResponse"
-    "fixture/ListVolumeRecoveryPointsResponse"
+    "fixture/ListVolumeRecoveryPointsResponse.proto"
     storageGateway
     (Proxy :: Proxy ListVolumeRecoveryPoints)
 
 testAddWorkingStorageResponse :: AddWorkingStorageResponse -> TestTree
 testAddWorkingStorageResponse = res
     "AddWorkingStorageResponse"
-    "fixture/AddWorkingStorageResponse"
+    "fixture/AddWorkingStorageResponse.proto"
     storageGateway
     (Proxy :: Proxy AddWorkingStorage)
 
 testListGatewaysResponse :: ListGatewaysResponse -> TestTree
 testListGatewaysResponse = res
     "ListGatewaysResponse"
-    "fixture/ListGatewaysResponse"
+    "fixture/ListGatewaysResponse.proto"
     storageGateway
     (Proxy :: Proxy ListGateways)
 
 testListVolumesResponse :: ListVolumesResponse -> TestTree
 testListVolumesResponse = res
     "ListVolumesResponse"
-    "fixture/ListVolumesResponse"
+    "fixture/ListVolumesResponse.proto"
     storageGateway
     (Proxy :: Proxy ListVolumes)
 
 testDescribeTapeRecoveryPointsResponse :: DescribeTapeRecoveryPointsResponse -> TestTree
 testDescribeTapeRecoveryPointsResponse = res
     "DescribeTapeRecoveryPointsResponse"
-    "fixture/DescribeTapeRecoveryPointsResponse"
+    "fixture/DescribeTapeRecoveryPointsResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeTapeRecoveryPoints)
 
 testDeleteVolumeResponse :: DeleteVolumeResponse -> TestTree
 testDeleteVolumeResponse = res
     "DeleteVolumeResponse"
-    "fixture/DeleteVolumeResponse"
+    "fixture/DeleteVolumeResponse.proto"
     storageGateway
     (Proxy :: Proxy DeleteVolume)
 
 testResetCacheResponse :: ResetCacheResponse -> TestTree
 testResetCacheResponse = res
     "ResetCacheResponse"
-    "fixture/ResetCacheResponse"
+    "fixture/ResetCacheResponse.proto"
     storageGateway
     (Proxy :: Proxy ResetCache)
 
 testActivateGatewayResponse :: ActivateGatewayResponse -> TestTree
 testActivateGatewayResponse = res
     "ActivateGatewayResponse"
-    "fixture/ActivateGatewayResponse"
+    "fixture/ActivateGatewayResponse.proto"
     storageGateway
     (Proxy :: Proxy ActivateGateway)
 
 testDescribeCacheResponse :: DescribeCacheResponse -> TestTree
 testDescribeCacheResponse = res
     "DescribeCacheResponse"
-    "fixture/DescribeCacheResponse"
+    "fixture/DescribeCacheResponse.proto"
     storageGateway
     (Proxy :: Proxy DescribeCache)
 
 testUpdateBandwidthRateLimitResponse :: UpdateBandwidthRateLimitResponse -> TestTree
 testUpdateBandwidthRateLimitResponse = res
     "UpdateBandwidthRateLimitResponse"
-    "fixture/UpdateBandwidthRateLimitResponse"
+    "fixture/UpdateBandwidthRateLimitResponse.proto"
     storageGateway
     (Proxy :: Proxy UpdateBandwidthRateLimit)
 
 testDeleteBandwidthRateLimitResponse :: DeleteBandwidthRateLimitResponse -> TestTree
 testDeleteBandwidthRateLimitResponse = res
     "DeleteBandwidthRateLimitResponse"
-    "fixture/DeleteBandwidthRateLimitResponse"
+    "fixture/DeleteBandwidthRateLimitResponse.proto"
     storageGateway
     (Proxy :: Proxy DeleteBandwidthRateLimit)
 
 testListLocalDisksResponse :: ListLocalDisksResponse -> TestTree
 testListLocalDisksResponse = res
     "ListLocalDisksResponse"
-    "fixture/ListLocalDisksResponse"
+    "fixture/ListLocalDisksResponse.proto"
     storageGateway
     (Proxy :: Proxy ListLocalDisks)
 
 testDeleteTapeResponse :: DeleteTapeResponse -> TestTree
 testDeleteTapeResponse = res
     "DeleteTapeResponse"
-    "fixture/DeleteTapeResponse"
+    "fixture/DeleteTapeResponse.proto"
     storageGateway
     (Proxy :: Proxy DeleteTape)
