                                                        :b :varchar
                                                        :primary-key [:a]))
                         (if-not-exists)
-                        ))))
-
-  (is (= "
-  ALTER TABLE foo ALTER foo TYPE int"
+                        )))))
+
+(deftest test-alter-table
+  (is (= "ALTER TABLE foo ALTER foo TYPE int"
          (normalize-string
           (alter-table :foo
                        (alter-column :foo :int)))))
 
-  (is (= "
-  ALTER TABLE foo ADD bar varchar"
+  (is (= "ALTER TABLE foo ADD bar varchar"
          (normalize-string
           (alter-table :foo
                        (add-column :bar :varchar)))))
 
-  (is (= "
-  ALTER TABLE foo DROP bar"
+  (is (= "ALTER TABLE foo DROP bar"
          (normalize-string
           (alter-table :foo
                        (drop-column :bar)))))
 
-  (is (= "
-  ALTER TABLE foo ALTER foo TYPE int"
+  (is (= "ALTER TABLE foo ALTER foo TYPE int"
          (normalize-string
           (alter-table :foo
                        (alter-column :foo :int)
-                       (with {:default-ttl 100})
-                       ))))
-
+                       (with {:default-ttl 100}))))))
+
+(deftest test-drop-table
   (is (= "DROP TABLE foo"
-         (drop-table :foo)))
-
-  (is (= "
-  CREATE INDEX foo ON bar(baz)"
+         (normalize-string
+          (drop-table :foo)))))
+
+(deftest test-create-index
+  (is (= "CREATE INDEX foo ON bar(baz)"
          (normalize-string
           (create-index "foo"
                         (on-table "bar")
                         (and-column "baz")))))
 
-  (is (= "
-  CREATE INDEX foo ON bar(KEYS(baz))"
+  (is (= "CREATE INDEX foo ON bar(KEYS(baz))"
          (normalize-string
           (create-index "foo"
                         (on-table "bar")
-                        (and-keys-of-column "baz")))))
-
-
+                        (and-keys-of-column "baz"))))))
+
+(deftest test-drop-keyspace
   (is (= "DROP KEYSPACE foo;"
-         (drop-keyspace "foo")))
+         (normalize-string
+          (drop-keyspace "foo"))))
   (is (= "DROP KEYSPACE IF EXISTS foo;"
-         (drop-keyspace "foo" (if-exists))))
-
-
+         (normalize-string
+          (drop-keyspace "foo" (if-exists))))))
+
+(deftest test-create-keyspace
   (is (= "CREATE KEYSPACE IF NOT EXISTS foo;"
-         (create-keyspace "foo"
-                          (if-not-exists))))
-
-  (is (= "CREATE KEYSPACE IF NOT EXISTS foo WITH REPLICATION = {class: 'SimpleStrategy', replication_factor: 1};"
-         (create-keyspace "foo"
-                          (with
+         (normalize-string
+          (create-keyspace "foo"
+                           (if-not-exists)))))
+
+  (is (= "CREATE KEYSPACE IF NOT EXISTS foo WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};"
+         (normalize-string
+          (create-keyspace "foo"
+                           (with
                             {:replication
                              {"class"              "SimpleStrategy"
                               "replication_factor" 1}})
-                          (if-not-exists))))
-
-  )
+                           (if-not-exists))))))

                        (with {:compact-storage true})
                        ))))

  (is (= "
  CREATE TABLE foo(
    a int,
    b map<varchar, varchar>,
    PRIMARY KEY(a))"

                                                       :b (map-type :varchar :varchar)
                                                       :primary-key [:a]))))))

  (is (= "CREATE TABLE IF NOT EXISTS foo(
    a int,
    b varchar,
    PRIMARY KEY(a))"
