diff --git a/hspec-golden-aeson.cabal b/hspec-golden-aeson.cabal
--- a/hspec-golden-aeson.cabal
+++ b/hspec-golden-aeson.cabal
@@ -1,5 +1,5 @@
 name:                hspec-golden-aeson
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            Use tests to monitor changes in Aeson serialization
 description:         Use tests to monitor changes in Aeson serialization
 homepage:            https://github.com/plow-technologies/hspec-golden-aeson#readme
diff --git a/src/Test/Aeson/Internal/GoldenSpecs.hs b/src/Test/Aeson/Internal/GoldenSpecs.hs
--- a/src/Test/Aeson/Internal/GoldenSpecs.hs
+++ b/src/Test/Aeson/Internal/GoldenSpecs.hs
@@ -59,10 +59,10 @@
 goldenSpecsWithNote settings@Settings{..} proxy mNote = do
   mModuleName <-
     if useModuleNameAsSubDirectory
-      then return Nothing
-      else do
+      then do
         arbA <- runIO $ generate (arbitrary :: Gen a)
-        return $ Just $ show . tyConModule . typeRepTyCon . typeOf $ arbA
+        return $ Just $ tyConModule . typeRepTyCon . typeOf $ arbA
+      else return Nothing
 
   let goldenFile = mkGoldenFile topDir mModuleName proxy
       note = maybe "" (" " ++) mNote
diff --git a/test/Test/Aeson/GenericSpecsSpec.hs b/test/Test/Aeson/GenericSpecsSpec.hs
--- a/test/Test/Aeson/GenericSpecsSpec.hs
+++ b/test/Test/Aeson/GenericSpecsSpec.hs
@@ -2,20 +2,13 @@
 
 module Test.Aeson.GenericSpecsSpec where
 
-import           Control.Monad.IO.Class
-
-import           Data.Aeson
 import           Data.Proxy
 
-import           GHC.Generics
-
 import           System.Directory
 
 import           Test.Aeson.GenericSpecs
 import           Test.Hspec
 import           Test.Hspec.Core.Runner
-import           Test.QuickCheck
-import           Test.QuickCheck.Arbitrary.ADT
 
 import           Test.Utils
 
@@ -30,14 +23,88 @@
 -- summaryFailures
 spec :: Spec
 spec = do
-  describe "Test.Aeson.GenericSpecs: roundTrip" $ do
+  describe "Test.Aeson.GenericSpecs: roundtripSpecs" $ do
     it "should pass when ToJSON and FromJSON are defined appropriately" $ do
+      (s1,_) <- hspecSilently $ roundtripSpecs (Proxy :: Proxy T.Person)
+      summaryFailures s1 `shouldBe` 0
+
+    it "should fail when ToJSON and FromJSON definitions do not match" $ do
+      (s1,_) <- hspecSilently $ roundtripSpecs (Proxy :: Proxy MTFS.Person)
+      summaryFailures s1 `shouldBe` 1
+
+  describe "Test.Aeson.GenericSpecs: roundtripADTSpecs" $ do
+    it "should pass when ToJSON and FromJSON are defined appropriately" $ do
       (s1,_) <- hspecSilently $ roundtripADTSpecs (Proxy :: Proxy T.Person)
       summaryFailures s1 `shouldBe` 0
 
     it "should fail when ToJSON and FromJSON definitions do not match" $ do
       (s1,_) <- hspecSilently $ roundtripADTSpecs (Proxy :: Proxy MTFS.Person)
       summaryFailures s1 `shouldBe` 1
+
+  describe "Test.Aeson.GenericSpecs: goldenSpecs" $ do
+    it "create golden test files" $ do
+      -- clean up previously existing golden folder
+      bg <- doesDirectoryExist "golden"
+      if bg
+        then removeDirectoryRecursive "golden"
+        else return ()
+
+      -- files for Person and SumType do not exist
+      -- create them by running goldenADTSpecs
+      _ <- hspecSilently $ goldenSpecs defaultSettings (Proxy :: Proxy T.Person)
+      _ <- hspecSilently $ goldenSpecs defaultSettings (Proxy :: Proxy T.SumType)
+
+      doesFileExist "golden/Person.json"  `shouldReturn` True
+      doesFileExist "golden/SumType.json" `shouldReturn` True
+
+    it "create golden test files" $ do
+      -- clean up previously existing golden folder
+      bg <- doesDirectoryExist "golden"
+      if bg
+        then removeDirectoryRecursive "golden"
+        else return ()
+
+      -- files for Person and SumType do not exist
+      -- create them by running goldenADTSpecs
+      _ <- hspecSilently $ goldenSpecs (defaultSettings { useModuleNameAsSubDirectory = True }) (Proxy :: Proxy T.Person)
+      _ <- hspecSilently $ goldenSpecs (defaultSettings { useModuleNameAsSubDirectory = True }) (Proxy :: Proxy T.SumType)
+
+      doesFileExist "golden/Test.Types/Person.json"  `shouldReturn` True
+      doesFileExist "golden/Test.Types/SumType.json" `shouldReturn` True
+
+    it "create golden test files in a user defined directory" $ do
+      let topDir = "json-tests"
+      -- clean up previously existing user defined folder
+      bg <- doesDirectoryExist topDir
+      if bg
+        then removeDirectoryRecursive topDir
+        else return ()
+
+      -- files for Person and SumType do not exist
+      -- create them by running goldenADTSpecs
+      _ <- hspecSilently $ goldenSpecs (defaultSettings {goldenDirectoryOption = CustomDirectoryName topDir}) (Proxy :: Proxy T.Person)
+      _ <- hspecSilently $ goldenSpecs (defaultSettings {goldenDirectoryOption = CustomDirectoryName topDir}) (Proxy :: Proxy T.SumType)
+
+      doesFileExist "json-tests/Person.json"  `shouldReturn` True
+      doesFileExist "json-tests/SumType.json" `shouldReturn` True
+
+    it "goldenADTSpecs should pass for existing golden files in which model types and serialization have not changed" $ do
+      (s1,_) <- hspecSilently $ goldenSpecs defaultSettings (Proxy :: Proxy T.Person)
+      (s2,_) <- hspecSilently $ goldenSpecs defaultSettings (Proxy :: Proxy T.SumType)
+      (summaryFailures s1 + summaryFailures s2) `shouldBe` 0
+
+    it "goldenADTSpecs for types which have changed the values of ToJSON or FromJSON keys should fail to match the goldenFiles" $ do
+      (s1,_) <- hspecSilently $ goldenSpecs defaultSettings (Proxy :: Proxy TBS.Person)
+      summaryFailures s1 `shouldBe` 1
+
+    it "goldenADTSpecs for types which have changed the values of ToJSON or FromJSON keys should fail to match the goldenFiles" $ do
+      (s1,_) <- hspecSilently $ goldenSpecs defaultSettings (Proxy :: Proxy TNS.Person)
+      summaryFailures s1 `shouldBe` 1
+
+    it "goldenADTSpecs for types which have altered the name of the selector and using generic implementation of ToJSON and FromJSON should fail to match the goldenFiles" $ do
+      (s1,_) <- hspecSilently $ goldenSpecs defaultSettings (Proxy :: Proxy TAS.Person)
+      summaryFailures s1 `shouldBe` 1
+
 
   describe "Test.Aeson.GenericSpecs: goldenADTSpecs" $ do
     it "create golden test files" $ do
diff --git a/test/Test/Types/BrokenSerialization.hs b/test/Test/Types/BrokenSerialization.hs
--- a/test/Test/Types/BrokenSerialization.hs
+++ b/test/Test/Types/BrokenSerialization.hs
@@ -18,7 +18,9 @@
     ,  "personAge"  .= age
     ]
 instance FromJSON Person where
-  parseJSON (Object o) = Person <$> o .: "personName" <*> o .: "personAge"
+  parseJSON = withObject "Expected a Person object" $ \o ->
+    Person <$> o .: "personName"
+           <*> o .: "personAge"
 
 instance ToADTArbitrary Person
 instance Arbitrary Person where