diff --git a/simple-cairo.cabal b/simple-cairo.cabal
--- a/simple-cairo.cabal
+++ b/simple-cairo.cabal
@@ -3,11 +3,9 @@
 -- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 7c3e571101f6a187c78f2a538fd77a1ce529acc5dc775036e798b6c186a1c8bc
 
 name:           simple-cairo
-version:        0.1.0.5
+version:        0.1.0.6
 synopsis:       Binding to Cairo library
 description:    Please see the README on GitHub at <https://github.com/YoshikuniJujo/simple-cairo#readme>
 category:       Graphics
diff --git a/test/cairo-image-test.hs b/test/cairo-image-test.hs
--- a/test/cairo-image-test.hs
+++ b/test/cairo-image-test.hs
@@ -7,11 +7,11 @@
 
 main :: IO ()
 main = do
-	let	pxl = PixelArgb32 0x01 0x02 0x03 0x04
-		PixelArgb32 a r g b = pxl
+	let	pxl = PixelArgb32Straight 0x01 0x02 0x03 0x04
+		PixelArgb32Straight a r g b = pxl
 	print pxl
 	print (a, r, g, b)
 
 foo :: (Word8, Word8, Word8, Word8)
-foo = case PixelArgb32 0x01 0x02 0x03 0x04 of
-	PixelArgb32 a r g b -> (a, r, g, b)
+foo = case PixelArgb32Straight 0x01 0x02 0x03 0x04 of
+	PixelArgb32Straight a r g b -> (a, r, g, b)
diff --git a/test/exception.hs b/test/exception.hs
--- a/test/exception.hs
+++ b/test/exception.hs
@@ -1,18 +1,26 @@
+{-# LANGUAGE TypeApplications #-}
 {-# OPTIONS_GHC -Wall -fno-warn-tabs #-}
 
-import Graphics.Cairo.Values
+import Control.Exception
+
 import Graphics.Cairo.Drawing.CairoT
 import Graphics.Cairo.Drawing.Paths
 import Graphics.Cairo.Surfaces.ImageSurfaces
-import Graphics.Cairo.Monad
 
+import Graphics.Cairo.Exception
+
+import Data.CairoImage.Internal
+
 main :: IO ()
-main = do
-	s <- cairoImageSurfaceCreate cairoFormatArgb32 500 500
+main = mainGen `catch` (print @CairoStatus)
+
+mainGen :: IO ()
+mainGen = do
+	s <- cairoImageSurfaceCreate CairoFormatArgb32 500 500
 	cr <- cairoCreate s
 	cairoLineTo cr 100 100
 	cairoNewPath cr
 	cairoLineTo cr 0 0
 	cairoStroke cr
 	cairoPopGroupToSource cr
-	print =<< cairoImageSurfaceGetData s
+	print =<< cairoImageSurfaceGetCairoImage s
diff --git a/test/test-rotate.hs b/test/test-rotate.hs
--- a/test/test-rotate.hs
+++ b/test/test-rotate.hs
@@ -1,19 +1,19 @@
 {-# OPTIONS_GHC -Wall -fno-warn-tabs #-}
 
 import Graphics.Cairo.Exception
-import Graphics.Cairo.Values
 import Graphics.Cairo.Drawing.CairoT
 import Graphics.Cairo.Drawing.CairoPatternT
 import Graphics.Cairo.Drawing.Transformations
 import Graphics.Cairo.Surfaces.ImageSurfaces
 import Graphics.Cairo.Surfaces.PngSupport
 
+import Data.CairoImage.Internal
 import Paths_simple_cairo
 
 main :: IO ()
 main = do
 	putStrLn "*** TEST ROTATE BEGIN ***"
-	sfc0 <- cairoImageSurfaceCreate cairoFormatArgb32 256 256
+	sfc0 <- CairoSurfaceTImage <$> cairoImageSurfaceCreate CairoFormatArgb32 256 256
 	cr <- cairoCreate sfc0
 	sfc <- cairoSurfaceCreateFromPng =<< getDataFileName "HaskellLogo.png"
 	ptn <- cairoPatternCreateForSurface sfc