diff --git a/License.txt b/License.txt
--- a/License.txt
+++ b/License.txt
@@ -1,4 +1,4 @@
-Copyright (c) The Regents of the University of California.
+Copyright (c) Gabriel Wicke <wicke@wikidev.net>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/bits-atomic.cabal b/bits-atomic.cabal
--- a/bits-atomic.cabal
+++ b/bits-atomic.cabal
@@ -1,5 +1,5 @@
 Name:               bits-atomic
-Version:            0.1.0
+Version:            0.1.1
 License:            BSD3
 License-File:       License.txt
 Maintainer:         Gabriel Wicke <wicke@wikidev.net>
@@ -48,17 +48,22 @@
     default:     False
 
 Executable test
-    if !flag(test)
-        buildable:     False
+    if flag(test)
+        buildable:  True
+        build-depends:   
+                    base >= 4 && < 6, 
+                    QuickCheck, 
+                    HUnit,
+                    test-framework-quickcheck2,
+                    test-framework-hunit,
+                    test-framework
+    else
+        buildable:  False
     hs-source-dirs:  ., test
     other-modules:   Data.Bits.Atomic
     main-is:         test.hs
-    GHC-Options:      -O2 -funbox-strict-fields -threaded
+    GHC-Options:      -O2 -funbox-strict-fields -threaded -fhpc
     GHC-Prof-Options: -auto-all
 
     Include-Dirs:     cbits
     C-Sources:        cbits/atomic-bitops-gcc.c
-    build-depends:   base >= 4 && < 6, QuickCheck, HUnit,
-                     test-framework-quickcheck2,
-                     test-framework-hunit,
-                     test-framework
diff --git a/test/test.hs b/test/test.hs
--- a/test/test.hs
+++ b/test/test.hs
@@ -29,6 +29,7 @@
 main :: IO ()
 main = defaultMain tests
 
+-- TODO: Use Quickcheck to produce arbitrary values?
 testPattern :: Integral a => a
 testPattern = 0xdeadbeef
 
@@ -36,16 +37,16 @@
 
 testTypes :: PolyTest -> Assertion
 testTypes _test = do
-    _test (1 :: Int)
-    _test (1 :: Word)
-    _test (1 :: Int8)
-    _test (1 :: Int16)
-    _test (1 :: Int32)
-    _test (1 :: Int64)
-    _test (1 :: Word8)
-    _test (1 :: Word16)
-    _test (1 :: Word32)
-    _test (1 :: Word64)
+    _test (testPattern :: Int)
+    _test (testPattern :: Word)
+    _test (testPattern :: Int8)
+    _test (testPattern :: Int16)
+    _test (testPattern :: Int32)
+    _test (testPattern :: Int64)
+    _test (testPattern :: Word8)
+    _test (testPattern :: Word16)
+    _test (testPattern :: Word32)
+    _test (testPattern :: Word64)
 
 test_compareAndSwap :: (AtomicBits a, Storable a, Integral a, Bounded a) => 
              a -> Assertion