diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for influxdb
 
+## v1.6.0.7 - 2018-07-23
+
+* Relax upper version bound for base to support GHC 8.6 (#69)
+
 ## v1.6.0.6 - 2018-07-07
 
 * Relax upper version bound for lens
diff --git a/influxdb.cabal b/influxdb.cabal
--- a/influxdb.cabal
+++ b/influxdb.cabal
@@ -1,10 +1,10 @@
 name: influxdb
-version: 1.6.0.6
+version: 1.6.0.7
 synopsis: Haskell client library for InfluxDB
 description:
   @influxdb@ is a Haskell client library for InfluxDB.
   .
-  Read "Database.InfluxDB" for a quick start guide.
+  See "Database.InfluxDB" for a quick start guide.
 homepage: https://github.com/maoe/influxdb-haskell
 license: BSD3
 license-file: LICENSE
@@ -18,7 +18,7 @@
   GHC == 7.10.3
   GHC == 8.0.2
   GHC == 8.2.2
-  GHC == 8.4.1
+  GHC == 8.4.3
 
 extra-source-files:
   README.md
@@ -72,7 +72,7 @@
     ViewPatterns
   ghc-options: -Wall
   build-depends:
-      base >= 4.8 && < 4.12
+      base >= 4.8 && < 4.13
     , aeson >= 0.7 && < 1.5
     , attoparsec < 0.14
     , bytestring >= 0.10 && < 0.11
@@ -91,24 +91,6 @@
     , unordered-containers < 0.3
     , vector >= 0.10 && < 0.13
   hs-source-dirs: src
-  default-language: Haskell2010
-
-test-suite test-suite
-  type: exitcode-stdio-1.0
-  main-is: test-suite.hs
-  build-depends:
-      base
-    , http-client
-    , HUnit
-    , influxdb
-    , mtl
-    , tasty
-    , tasty-hunit <= 0.11
-    , tasty-quickcheck
-    , tasty-th
-    , text
-    , vector
-  hs-source-dirs: tests
   default-language: Haskell2010
 
 test-suite doctests
diff --git a/src/Database/InfluxDB.hs b/src/Database/InfluxDB.hs
--- a/src/Database/InfluxDB.hs
+++ b/src/Database/InfluxDB.hs
@@ -191,7 +191,7 @@
 === Using a custom data type
 
 We can define our custom data type and write a 'QueryResults' instance
-instead. 'getField', 'parseUTCTime' and 'parseQueryField' etc are avilable to
+instead. 'getField', 'parseUTCTime' and 'parseJSON' etc are avilable to
 make it easier to write a JSON decoder.
 
 >>> :{
diff --git a/src/Database/InfluxDB/Format.hs b/src/Database/InfluxDB/Format.hs
--- a/src/Database/InfluxDB/Format.hs
+++ b/src/Database/InfluxDB/Format.hs
@@ -157,8 +157,10 @@
 database :: Format r (Database -> r)
 database = makeFormat $ \(Database name) -> identifierBuilder name
 
--- | Format a key (e.g. field names, tag names, tag values etc).
+-- | Format an identifier (e.g. field names, tag names, etc).
 --
+-- Identifiers in InfluxDB protocol are surrounded with double quotes.
+--
 -- >>> formatQuery ("SELECT "%key%" FROM series") "field"
 -- "SELECT \"field\" FROM series"
 -- >>> formatQuery ("SELECT "%key%" FROM series") "foo\"bar"
@@ -190,7 +192,7 @@
   mconcat . L.intersperse ","
     . map (\(Measurement name) -> identifierBuilder name)
 
--- | Format 'QueryField'.
+-- | Format an InfluxDB value. Good for field and tag values.
 --
 -- >>> formatQuery ("SELECT * FROM series WHERE "%key%" = "%field) "location" "tokyo"
 -- "SELECT * FROM series WHERE \"location\" = 'tokyo'"
diff --git a/tests/test-suite.hs b/tests/test-suite.hs
deleted file mode 100644
--- a/tests/test-suite.hs
+++ /dev/null
@@ -1,23 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TemplateHaskell #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-import Control.Applicative
-import Control.Exception as E
-import Control.Monad.Trans
-import Data.Int
-import Data.List (find)
-import Data.Monoid
-import Data.Text (Text)
-import Data.Unique
-import Data.Word
-import qualified Data.Text as T
-import qualified Data.Text.Lazy as TL
-import qualified Data.Vector as V
-
-import Test.Tasty.HUnit
-import Test.Tasty.TH
-
-import Database.InfluxDB
-
-main :: IO ()
-main = $defaultMainGenerator