diff --git a/tests/Test/StarWars/QueryTests.hs b/tests/Test/StarWars/QueryTests.hs
index 529c386..994f7bc 100644
--- a/tests/Test/StarWars/QueryTests.hs
+++ b/tests/Test/StarWars/QueryTests.hs
@@ -1,13 +1,14 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
-module Test.StarWars.QueryTests where
+module Test.StarWars.QueryTests (test) where
 
 import Data.Aeson (object, (.=))
+import qualified Data.Aeson as Aeson (Value)
 import Data.Text (Text)
 import Text.RawString.QQ (r)
 
 import Test.Tasty (TestTree, testGroup)
-import Test.Tasty.HUnit (testCase, (@?=))
+import Test.Tasty.HUnit (Assertion, testCase, (@?=))
 
 import Data.GraphQL
 
@@ -16,104 +17,105 @@ import Test.StarWars.Schema
 -- * Test
 -- See https://github.com/graphql/graphql-js/blob/master/src/__tests__/starWarsQueryTests.js
 
+testQuery :: Text -> Aeson.Value -> Assertion
+testQuery q expected = graphql schema q @?= Just expected
+
 test :: TestTree
 test = testGroup "Star Wars Query Tests"
   [ testGroup "Basic Queries"
-    [ testCase "R2-D2 hero" $ (@?=) (graphql schema [r|
-  query HeroNameQuery {
-    hero {
-      id
-    }
-  }|]) . Just
+    [ testCase "R2-D2 hero" . testQuery
+        [r| query HeroNameQuery {
+              hero {
+                id
+              }
+            }
+        |]
+      $ object ["hero" .= object ["id" .= ("2001" :: Text)]]
+    , testCase "R2-D2 ID and friends" . testQuery
+        [r| query HeroNameAndFriendsQuery {
+              hero {
+                id
+                name
+                friends {
+                  name
+                }
+              }
+            }
+        |]
       $ object [
           "hero" .= object [
-                "id"   .= ("2001" :: Text)
-              ]
-          ]
-
-    , testCase "R2-D2 ID and friends" $ (@?=) (graphql schema [r|
-  query HeroNameAndFriendsQuery {
-    hero {
-      id
-      name
-      friends {
-        name
-      }
-    }
-  }|]) . Just
-       $ object [
-            "hero" .= object [
-                "id" .= ("2001" :: Text)
-              , "name" .= ("R2-D2" :: Text)
-              , "friends" .= [
-                      object ["name" .= ("Luke Skywalker" :: Text)]
-                    , object ["name" .= ("Han Solo" :: Text)]
-                    , object ["name" .= ("Leia Organa" :: Text)]
-                    ]
-              ]
-       ]
+              "id" .= ("2001" :: Text)
+            , "name" .= ("R2-D2" :: Text)
+            , "friends" .= [
+                  object ["name" .= ("Luke Skywalker" :: Text)]
+                , object ["name" .= ("Han Solo" :: Text)]
+                , object ["name" .= ("Leia Organa" :: Text)]
+                ]
+            ]
+        ]
     ]
   , testGroup "Nested Queries"
-    [ testCase "R2-D2 friends" $ (@?=) (graphql schema [r|
-  query NestedQuery {
-    hero {
-      name
-      friends {
-        name
-        appearsIn
-        friends {
-          name
-        }
-      }
-    }
-  }|]) . Just
-       $ object [
-           "hero" .= object [
-                "name" .= ("R2-D2" :: Text)
-              , "friends" .= [
-                     object [
-                         "name" .= ("Luke Skywalker" :: Text)
-                       , "appearsIn" .= ["NEWHOPE","EMPIRE","JEDI" :: Text]
-                       , "friends" .= [
-                             object ["name" .= ("Han Solo" :: Text)]
-                           , object ["name" .= ("Leia Organa" :: Text)]
-                           , object ["name" .= ("C-3PO" :: Text)]
-                           , object ["name" .= ("R2-D2" :: Text)]
-                           ]
-                       ]
-                   , object [
-                         "name" .= ("Han Solo" :: Text)
-                       , "appearsIn" .= [ "NEWHOPE","EMPIRE","JEDI" :: Text]
-                       , "friends" .= [
-                             object ["name" .= ("Luke Skywalker" :: Text)]
-                           , object ["name" .= ("Leia Organa" :: Text)]
-                           , object ["name" .= ("R2-D2" :: Text)]
-                           ]
-                       ]
-                   , object [
-                         "name" .= ("Leia Organa" :: Text)
-                       , "appearsIn" .= [ "NEWHOPE","EMPIRE","JEDI" :: Text]
-                       , "friends" .= [
-                             object ["name" .= ("Luke Skywalker" :: Text)]
-                           , object ["name" .= ("Han Solo" :: Text)]
-                           , object ["name" .= ("C-3PO" :: Text)]
-                           , object ["name" .= ("R2-D2" :: Text)]
-                           ]
-                       ]
-                   ]
-               ]
-           ]
-    , testCase "Luke ID" $ (@?=) (graphql schema [r|
-query FetchLukeQuery {
-  human(id: "1000") {
-    name
-  }
-}|]) . Just
-     $ object [
-        "human" .= object [
-           "name" .= ("Luke Skywalker" :: Text)
-           ]
+    [ testCase "R2-D2 friends" . testQuery
+        [r| query NestedQuery {
+              hero {
+                name
+                friends {
+                  name
+                  appearsIn
+                    friends {
+                      name
+                    }
+                }
+              }
+            }
+        |]
+      $ object [
+          "hero" .= object [
+              "name" .= ("R2-D2" :: Text)
+            , "friends" .= [
+                  object [
+                      "name" .= ("Luke Skywalker" :: Text)
+                    , "appearsIn" .= ["NEWHOPE","EMPIRE","JEDI" :: Text]
+                    , "friends" .= [
+                          object ["name" .= ("Han Solo" :: Text)]
+                        , object ["name" .= ("Leia Organa" :: Text)]
+                        , object ["name" .= ("C-3PO" :: Text)]
+                        , object ["name" .= ("R2-D2" :: Text)]
+                        ]
+                    ]
+                , object [
+                      "name" .= ("Han Solo" :: Text)
+                    , "appearsIn" .= [ "NEWHOPE","EMPIRE","JEDI" :: Text]
+                    , "friends" .= [
+                          object ["name" .= ("Luke Skywalker" :: Text)]
+                        , object ["name" .= ("Leia Organa" :: Text)]
+                        , object ["name" .= ("R2-D2" :: Text)]
+                        ]
+                    ]
+                , object [
+                      "name" .= ("Leia Organa" :: Text)
+                    , "appearsIn" .= [ "NEWHOPE","EMPIRE","JEDI" :: Text]
+                    , "friends" .= [
+                          object ["name" .= ("Luke Skywalker" :: Text)]
+                        , object ["name" .= ("Han Solo" :: Text)]
+                        , object ["name" .= ("C-3PO" :: Text)]
+                        , object ["name" .= ("R2-D2" :: Text)]
+                        ]
+                    ]
+                ]
+            ]
+        ]
+    , testCase "Luke ID" . testQuery
+        [r| query FetchLukeQuery {
+              human(id: "1000") {
+                name
+              }
+            }
+        |]
+      $ object [
+          "human" .= object [
+             "name" .= ("Luke Skywalker" :: Text)
+          ]
         ]
     ]
   ]
-