diff --git a/src/context.c b/src/context.c
index 74cbe553..7fb20161 100644
--- a/src/context.c
+++ b/src/context.c
@@ -193,7 +193,7 @@ PHP_METHOD(CairoContext, __construct)
 	cairo_context_object *context_object;
 	cairo_surface_object *surface_object;
 
-        if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|o", &surface_zval) == FAILURE) {
+        if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "o", &surface_zval) == FAILURE) {
 		return;
 	}
         
diff --git a/src/image_surface.c b/src/image_surface.c
index aa255d7a..e1dee577 100755
--- a/src/image_surface.c
+++ b/src/image_surface.c
@@ -289,7 +289,7 @@ PHP_METHOD(CairoImageSurface, createFromPng)
 	} else if(Z_TYPE_P(stream_zval) == IS_RESOURCE)  {
 		php_stream_from_zval(stream, stream_zval);	
 	} else {
-		zend_throw_exception(ce_cairo_exception, "CairoImageSurface::createFromPng() expects parameter 1 to be a string or a stream resource", 0);
+		zend_throw_exception(ce_cairo_exception, "Cairo\\Surface\\Image::createFromPng() expects parameter 1 to be a string or a stream resource", 0);
 		return;
 	}
 
diff --git a/src/matrix.c b/src/matrix.c
index 5a12a6c8..baaf533d 100644
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -127,9 +127,9 @@ PHP_METHOD(CairoMatrix, __construct)
 	/* read defaults from object */
 	double xx = cairo_matrix_get_property_value(getThis(), "xx");
 	double yx = cairo_matrix_get_property_value(getThis(), "yx");
-        double xy = cairo_matrix_get_property_value(getThis(), "xy");
+	double xy = cairo_matrix_get_property_value(getThis(), "xy");
 	double yy = cairo_matrix_get_property_value(getThis(), "yy");
-        double x0 = cairo_matrix_get_property_value(getThis(), "x0");
+	double x0 = cairo_matrix_get_property_value(getThis(), "x0");
 	double y0 = cairo_matrix_get_property_value(getThis(), "y0");
 
 	/* overwrite with constructor if desired */
@@ -658,11 +658,11 @@ PHP_MINIT_FUNCTION(cairo_matrix)
 	ce.create_object = cairo_matrix_create_object;
 	ce_cairo_matrix = zend_register_internal_class(&ce);
 
-	zend_declare_property_long(ce_cairo_matrix, "xx", sizeof("xx")-1, 1, ZEND_ACC_PUBLIC);
+	zend_declare_property_long(ce_cairo_matrix, "xx", sizeof("xx")-1, 0, ZEND_ACC_PUBLIC);
 	zend_declare_property_long(ce_cairo_matrix, "xy", sizeof("xy")-1, 0, ZEND_ACC_PUBLIC);
 	zend_declare_property_long(ce_cairo_matrix, "x0", sizeof("x0")-1, 0, ZEND_ACC_PUBLIC);
 	zend_declare_property_long(ce_cairo_matrix, "yx", sizeof("yx")-1, 0, ZEND_ACC_PUBLIC);
-	zend_declare_property_long(ce_cairo_matrix, "yy", sizeof("yy")-1, 1, ZEND_ACC_PUBLIC);
+	zend_declare_property_long(ce_cairo_matrix, "yy", sizeof("yy")-1, 0, ZEND_ACC_PUBLIC);
 	zend_declare_property_long(ce_cairo_matrix, "y0", sizeof("y0")-1, 0, ZEND_ACC_PUBLIC);
 
 	return SUCCESS;
diff --git a/src/php_cairo_internal.h b/src/php_cairo_internal.h
index 9cc5b785..f5cddd3a 100644
--- a/src/php_cairo_internal.h
+++ b/src/php_cairo_internal.h
@@ -17,6 +17,11 @@
 #include <php.h>
 #include <cairo.h>
 
+#if defined(CAIRO_HAS_QUARTZ_FONT)
+#include <cairo-quartz.h>
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
 extern zend_class_entry *ce_cairo_exception;
 extern zend_class_entry *ce_cairo_status;
 extern zend_class_entry *ce_cairo_matrix;
@@ -117,9 +122,12 @@ extern cairo_status_t php_cairo_read_func(void *closure, const unsigned char *da
 /* Font + FontFace */
 typedef struct _cairo_font_face_object {
 	cairo_font_face_t *font_face;
-        stream_closure *closure;
+	#if defined(CAIRO_HAS_QUARTZ_FONT)
+	CGFontRef quartzref;
+	#endif
+	stream_closure *closure;
 	cairo_user_data_key_t key;
-        zend_object std;
+	zend_object std;
 } cairo_font_face_object;
 
 extern zend_object* cairo_font_face_create_object(zend_class_entry *ce);
diff --git a/src/quartz_font.c b/src/quartz_font.c
index 13b4f8a3..2303e835 100644
--- a/src/quartz_font.c
+++ b/src/quartz_font.c
@@ -25,6 +25,10 @@
 #include "php_cairo_internal.h"
 
 #if defined(CAIRO_HAS_QUARTZ_FONT)
+
+#include <cairo-quartz.h>
+#include <ApplicationServices/ApplicationServices.h>
+
 	zend_class_entry *ce_cairo_quartzfont;
 	zend_class_entry *ce_cairo_quartzatsufontnamecode;
 	zend_class_entry *ce_cairo_quartzatsufontnameplatform;
@@ -115,7 +119,7 @@ PHP_METHOD(CairoQuartzFontFace, createForCgfont)
 /* {{{ cairo_quartz_font_methods[] */
 const zend_function_entry cairo_quartz_font_methods[] = {
 	PHP_ME(CairoQuartzFontFace, createForCgfont, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-	PHP_ME(CairoQuartzFontFace, createForAtsuiFontId, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(CairoQuartzFontFace, createForAtsuFontId, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_FE_END
 };
 /* }}} */
diff --git a/src/region.c b/src/region.c
index 627bd129..1f058c81 100644
--- a/src/region.c
+++ b/src/region.c
@@ -23,7 +23,7 @@
 #include "php_cairo.h"
 
 zend_class_entry *ce_cairo_region;
-zend_class_entry *ce_cairo_rectangle;
+extern zend_class_entry *ce_cairo_rectangle;
 zend_class_entry *ce_cairo_region_overlap;
 
 static zend_object_handlers cairo_region_object_handlers;
diff --git a/src/svg_surface.c b/src/svg_surface.c
index 1b90c5e1..08483c6b 100644
--- a/src/svg_surface.c
+++ b/src/svg_surface.c
@@ -71,7 +71,7 @@ PHP_METHOD(CairoSvgSurface, __construct)
 		} else if(Z_TYPE_P(stream_zval) == IS_RESOURCE) {
 			php_stream_from_zval(stream, stream_zval);	
 		} else {
-			zend_throw_exception(ce_cairo_exception, "CairoSvgSurface::__construct() expects parameter 1 to be null, a string, or a stream resource", 0);
+			zend_throw_exception(ce_cairo_exception, "Cairo\\Surface\\Svg::__construct() expects parameter 1 to be null, a string, or a stream resource", 0);
 			return;
 		}
 
diff --git a/tests/Cairo/availableFonts.phpt b/tests/Cairo/availableFonts.phpt
index 6f7db38e..335bd6f1 100644
--- a/tests/Cairo/availableFonts.phpt
+++ b/tests/Cairo/availableFonts.phpt
@@ -14,7 +14,7 @@ var_dump($fonts[0]);
 try {
     Cairo::availableFonts('foo');
     trigger_error('Cairo::availableFonts should take no arguments');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
diff --git a/tests/Cairo/availableSurfaces.phpt b/tests/Cairo/availableSurfaces.phpt
index 6a92a553..add56334 100644
--- a/tests/Cairo/availableSurfaces.phpt
+++ b/tests/Cairo/availableSurfaces.phpt
@@ -14,7 +14,7 @@ var_dump($surfaces[0]);
 try {
     Cairo::availableSurfaces('foo');
     trigger_error('Cairo::availableSurfaces should take no arguments');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
diff --git a/tests/Cairo/statusToString.phpt b/tests/Cairo/statusToString.phpt
index 73983269..d20ded3b 100644
--- a/tests/Cairo/statusToString.phpt
+++ b/tests/Cairo/statusToString.phpt
@@ -6,10 +6,10 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump(Cairo::statusToString($context->status()));
@@ -18,7 +18,7 @@ var_dump(Cairo::statusToString($context->status()));
 try {
     Cairo::statusToString();
     trigger_error('Cairo::statusToString should take 1 argument');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     Cairo::statusToString(1, 1);
     trigger_error('Cairo::statusToString should take 1 argument');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,16 +34,16 @@ try {
 try {
     Cairo::statusToString(array());
     trigger_error('Cairo::statusToString arg 1 must be scalar (int)');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 string(21) "no error has occurred"
 Cairo::statusToString() expects exactly 1 parameter, 0 given
 Cairo::statusToString() expects exactly 1 parameter, 2 given
-Cairo::statusToString() expects parameter 1 to be long, array given
+Cairo::statusToString() expects parameter 1 to be int, array given
diff --git a/tests/Cairo/versionString.phpt b/tests/Cairo/versionString.phpt
index b20bcc7b..a2df36cd 100644
--- a/tests/Cairo/versionString.phpt
+++ b/tests/Cairo/versionString.phpt
@@ -13,7 +13,7 @@ var_dump($version);
 try {
     Cairo::versionString('foo');
     trigger_error('Cairo::versionString should take no arguments');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
diff --git a/tests/CairoContext/Paths/appendPath.phpt b/tests/CairoContext/Paths/appendPath.phpt
index acbdf2aa..493063aa 100644
--- a/tests/CairoContext/Paths/appendPath.phpt
+++ b/tests/CairoContext/Paths/appendPath.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->appendPath() method
+Cairo\Context->appendPath() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $path = $context->copyPath();
@@ -21,7 +21,7 @@ $context->appendPath($path);
 try {
     $context->appendPath();
     trigger_error('appendPath requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -29,7 +29,7 @@ try {
 try {
     $context->appendPath($path, 1);
     trigger_error('appendPath requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -37,17 +37,17 @@ try {
 try {
     $context->appendPath(1);
     trigger_error('appendPath requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoPath)#%d (0) {
+object(Cairo\Path)#%d (0) {
 }
-CairoContext::appendPath() expects exactly 1 parameter, 0 given
-CairoContext::appendPath() expects exactly 1 parameter, 2 given
-CairoContext::appendPath() expects parameter 1 to be CairoPath, integer given
\ No newline at end of file
+Cairo\Context::appendPath() expects exactly 1 parameter, 0 given
+Cairo\Context::appendPath() expects exactly 1 parameter, 2 given
+Cairo\Context::appendPath() expects parameter 1 to be Cairo\Path, int given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/arc.phpt b/tests/CairoContext/Paths/arc.phpt
index e3087048..7eb50a95 100644
--- a/tests/CairoContext/Paths/arc.phpt
+++ b/tests/CairoContext/Paths/arc.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->arc() method
+Cairo\Context->arc() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::arc() expects 5 parameters!');
+	trigger_error('Cairo\Context::arc() expects 5 parameters!');
 }
 
 $context->arc(0, 0, 1, 0, 2 * M_PI);
@@ -24,7 +24,7 @@ try {
     $context->arc();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
     $context->arc(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
     $context->arc(1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -48,7 +48,7 @@ try {
     $context->arc(1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -56,7 +56,7 @@ try {
     $context->arc(1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -64,7 +64,7 @@ try {
     $context->arc(1,1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -73,7 +73,7 @@ try {
     $context->arc(array(),1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -81,7 +81,7 @@ try {
     $context->arc(1,array(),1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -89,7 +89,7 @@ try {
     $context->arc(1,1,array(),1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -97,7 +97,7 @@ try {
     $context->arc(1,1,1,array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -105,24 +105,24 @@ try {
     $context->arc(1,1,1,1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::arc() expects exactly 5 parameters, 0 given
-CairoContext::arc() expects exactly 5 parameters, 1 given
-CairoContext::arc() expects exactly 5 parameters, 2 given
-CairoContext::arc() expects exactly 5 parameters, 3 given
-CairoContext::arc() expects exactly 5 parameters, 4 given
-CairoContext::arc() expects exactly 5 parameters, 6 given
-CairoContext::arc() expects parameter 1 to be double, array given
-CairoContext::arc() expects parameter 2 to be double, array given
-CairoContext::arc() expects parameter 3 to be double, array given
-CairoContext::arc() expects parameter 4 to be double, array given
-CairoContext::arc() expects parameter 5 to be double, array given
\ No newline at end of file
+Cairo\Context::arc() expects exactly 5 parameters, 0 given
+Cairo\Context::arc() expects exactly 5 parameters, 1 given
+Cairo\Context::arc() expects exactly 5 parameters, 2 given
+Cairo\Context::arc() expects exactly 5 parameters, 3 given
+Cairo\Context::arc() expects exactly 5 parameters, 4 given
+Cairo\Context::arc() expects exactly 5 parameters, 6 given
+Cairo\Context::arc() expects parameter 1 to be float, array given
+Cairo\Context::arc() expects parameter 2 to be float, array given
+Cairo\Context::arc() expects parameter 3 to be float, array given
+Cairo\Context::arc() expects parameter 4 to be float, array given
+Cairo\Context::arc() expects parameter 5 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/arcNegative.phpt b/tests/CairoContext/Paths/arcNegative.phpt
index 660f02c1..ca34a27e 100644
--- a/tests/CairoContext/Paths/arcNegative.phpt
+++ b/tests/CairoContext/Paths/arcNegative.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->arcNegative() method
+Cairo\Context->arcNegative() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::arcNegative() expects 5 parameters!');
+	trigger_error('Cairo\Context::arcNegative() expects 5 parameters!');
 }
 
 $context->arcNegative(0, 0, 1, 0, 2 * M_PI);
@@ -24,7 +24,7 @@ try {
     $context->arcNegative();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
     $context->arcNegative(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
     $context->arcNegative(1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -48,7 +48,7 @@ try {
     $context->arcNegative(1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -56,7 +56,7 @@ try {
     $context->arcNegative(1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -64,7 +64,7 @@ try {
     $context->arcNegative(1,1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -73,7 +73,7 @@ try {
     $context->arcNegative(array(),1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -81,7 +81,7 @@ try {
     $context->arcNegative(1,array(),1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -89,7 +89,7 @@ try {
     $context->arcNegative(1,1,array(),1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -97,7 +97,7 @@ try {
     $context->arcNegative(1,1,1,array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -105,24 +105,24 @@ try {
     $context->arcNegative(1,1,1,1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::arcNegative() expects exactly 5 parameters, 0 given
-CairoContext::arcNegative() expects exactly 5 parameters, 1 given
-CairoContext::arcNegative() expects exactly 5 parameters, 2 given
-CairoContext::arcNegative() expects exactly 5 parameters, 3 given
-CairoContext::arcNegative() expects exactly 5 parameters, 4 given
-CairoContext::arcNegative() expects exactly 5 parameters, 6 given
-CairoContext::arcNegative() expects parameter 1 to be double, array given
-CairoContext::arcNegative() expects parameter 2 to be double, array given
-CairoContext::arcNegative() expects parameter 3 to be double, array given
-CairoContext::arcNegative() expects parameter 4 to be double, array given
-CairoContext::arcNegative() expects parameter 5 to be double, array given
\ No newline at end of file
+Cairo\Context::arcNegative() expects exactly 5 parameters, 0 given
+Cairo\Context::arcNegative() expects exactly 5 parameters, 1 given
+Cairo\Context::arcNegative() expects exactly 5 parameters, 2 given
+Cairo\Context::arcNegative() expects exactly 5 parameters, 3 given
+Cairo\Context::arcNegative() expects exactly 5 parameters, 4 given
+Cairo\Context::arcNegative() expects exactly 5 parameters, 6 given
+Cairo\Context::arcNegative() expects parameter 1 to be float, array given
+Cairo\Context::arcNegative() expects parameter 2 to be float, array given
+Cairo\Context::arcNegative() expects parameter 3 to be float, array given
+Cairo\Context::arcNegative() expects parameter 4 to be float, array given
+Cairo\Context::arcNegative() expects parameter 5 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_append_path.phpt b/tests/CairoContext/Paths/cairo_append_path.phpt
deleted file mode 100644
index 40443f91..00000000
--- a/tests/CairoContext/Paths/cairo_append_path.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_append_path() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$path = cairo_copy_path($context);
-var_dump($path);
-
-cairo_append_path($context, $path);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_append_path();
-cairo_append_path($context);
-cairo_append_path($context, $path, 0);
-
-// check arg types, should be context object, path object
-cairo_append_path(1, $path);
-cairo_append_path($context, 1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoPath)#%d (0) {
-}
-
-Warning: cairo_append_path() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_append_path() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_append_path() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_append_path() must be an instance of CairoContext, integer given
-
-Warning: cairo_append_path() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_append_path() must be an instance of CairoPath, integer given
-
-Warning: cairo_append_path() expects parameter 2 to be CairoPath, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_arc.phpt b/tests/CairoContext/Paths/cairo_arc.phpt
deleted file mode 100644
index 92e512e7..00000000
--- a/tests/CairoContext/Paths/cairo_arc.phpt
+++ /dev/null
@@ -1,71 +0,0 @@
---TEST--
-cairo_arc() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_arc($context, 0, 0, 1, 0, 2 * M_PI);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_arc();
-cairo_arc($context);
-cairo_arc($context, 1);
-cairo_arc($context, 1, 1);
-cairo_arc($context, 1, 1, 1);
-cairo_arc($context, 1, 1, 1, 1);
-cairo_arc($context, 1, 1, 1, 1, 1, 1);
-
-/* wrong types */
-cairo_arc(1, 1, 1, 1, 1, 1);
-cairo_arc($context, array(), 1, 1, 1, 1);
-cairo_arc($context, 1, array(), 1, 1, 1);
-cairo_arc($context, 1, 1, array(), 1, 1);
-cairo_arc($context, 1, 1, 1, array(), 1);
-cairo_arc($context, 1, 1, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_arc() expects exactly 6 parameters, 0 given in %s on line %d
-
-Warning: cairo_arc() expects exactly 6 parameters, 1 given in %s on line %d
-
-Warning: cairo_arc() expects exactly 6 parameters, 2 given in %s on line %d
-
-Warning: cairo_arc() expects exactly 6 parameters, 3 given in %s on line %d
-
-Warning: cairo_arc() expects exactly 6 parameters, 4 given in %s on line %d
-
-Warning: cairo_arc() expects exactly 6 parameters, 5 given in %s on line %d
-
-Warning: cairo_arc() expects exactly 6 parameters, 7 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_arc() must be an instance of CairoContext, integer given
-
-Warning: cairo_arc() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_arc() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_arc() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_arc() expects parameter 4 to be double, array given in %s on line %d
-
-Warning: cairo_arc() expects parameter 5 to be double, array given in %s on line %d
-
-Warning: cairo_arc() expects parameter 6 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_arc_negative.phpt b/tests/CairoContext/Paths/cairo_arc_negative.phpt
deleted file mode 100644
index 5e296985..00000000
--- a/tests/CairoContext/Paths/cairo_arc_negative.phpt
+++ /dev/null
@@ -1,71 +0,0 @@
---TEST--
-cairo_arc_negative_negative() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_arc_negative($context, 0, 0, 1, 0, 2 * M_PI);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_arc_negative();
-cairo_arc_negative($context);
-cairo_arc_negative($context, 1);
-cairo_arc_negative($context, 1, 1);
-cairo_arc_negative($context, 1, 1, 1);
-cairo_arc_negative($context, 1, 1, 1, 1);
-cairo_arc_negative($context, 1, 1, 1, 1, 1, 1);
-
-/* wrong types */
-cairo_arc_negative(1, 1, 1, 1, 1, 1);
-cairo_arc_negative($context, array(), 1, 1, 1, 1);
-cairo_arc_negative($context, 1, array(), 1, 1, 1);
-cairo_arc_negative($context, 1, 1, array(), 1, 1);
-cairo_arc_negative($context, 1, 1, 1, array(), 1);
-cairo_arc_negative($context, 1, 1, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_arc_negative() expects exactly 6 parameters, 0 given in %s on line %d
-
-Warning: cairo_arc_negative() expects exactly 6 parameters, 1 given in %s on line %d
-
-Warning: cairo_arc_negative() expects exactly 6 parameters, 2 given in %s on line %d
-
-Warning: cairo_arc_negative() expects exactly 6 parameters, 3 given in %s on line %d
-
-Warning: cairo_arc_negative() expects exactly 6 parameters, 4 given in %s on line %d
-
-Warning: cairo_arc_negative() expects exactly 6 parameters, 5 given in %s on line %d
-
-Warning: cairo_arc_negative() expects exactly 6 parameters, 7 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_arc_negative() must be an instance of CairoContext, integer given
-
-Warning: cairo_arc_negative() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_arc_negative() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_arc_negative() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_arc_negative() expects parameter 4 to be double, array given in %s on line %d
-
-Warning: cairo_arc_negative() expects parameter 5 to be double, array given in %s on line %d
-
-Warning: cairo_arc_negative() expects parameter 6 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_close_path.phpt b/tests/CairoContext/Paths/cairo_close_path.phpt
deleted file mode 100644
index 7ee3eff2..00000000
--- a/tests/CairoContext/Paths/cairo_close_path.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_close_path() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_close_path($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_close_path();
-cairo_close_path($context, 1);
-
-// check arg types, should be context object
-cairo_close_path(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_close_path() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_close_path() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_close_path() must be an instance of CairoContext, integer given
-
-Warning: cairo_close_path() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_copy_path.phpt b/tests/CairoContext/Paths/cairo_copy_path.phpt
deleted file mode 100644
index 4eb96e4d..00000000
--- a/tests/CairoContext/Paths/cairo_copy_path.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-cairo_copy_path() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_copy_path($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_copy_path();
-cairo_copy_path($context, 1);
-
-// check arg types, should be context object
-cairo_copy_path(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoPath)#%d (0) {
-}
-
-Warning: cairo_copy_path() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_copy_path() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_copy_path() must be an instance of CairoContext, integer given
-
-Warning: cairo_copy_path() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_copy_path_flat.phpt b/tests/CairoContext/Paths/cairo_copy_path_flat.phpt
deleted file mode 100644
index 1e37209b..00000000
--- a/tests/CairoContext/Paths/cairo_copy_path_flat.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-cairo_copy_path_flat() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_copy_path_flat($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_copy_path_flat();
-cairo_copy_path_flat($context, 1);
-
-// check arg types, should be context object
-cairo_copy_path_flat(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoPath)#%d (0) {
-}
-
-Warning: cairo_copy_path_flat() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_copy_path_flat() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_copy_path_flat() must be an instance of CairoContext, integer given
-
-Warning: cairo_copy_path_flat() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_curve_to.phpt b/tests/CairoContext/Paths/cairo_curve_to.phpt
deleted file mode 100644
index c83d1a46..00000000
--- a/tests/CairoContext/Paths/cairo_curve_to.phpt
+++ /dev/null
@@ -1,77 +0,0 @@
---TEST--
-cairo_curve_to() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_curve_to($context, 0, 0, 1, 0, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_curve_to();
-cairo_curve_to($context);
-cairo_curve_to($context, 1);
-cairo_curve_to($context, 1, 1);
-cairo_curve_to($context, 1, 1, 1);
-cairo_curve_to($context, 1, 1, 1, 1);
-cairo_curve_to($context, 1, 1, 1, 1, 1);
-cairo_curve_to($context, 1, 1, 1, 1, 1, 1, 1);
-
-/* wrong types */
-cairo_curve_to(1, 1, 1, 1, 1, 1, 1);
-cairo_curve_to($context, array(), 1, 1, 1, 1, 1);
-cairo_curve_to($context, 1, array(), 1, 1, 1, 1);
-cairo_curve_to($context, 1, 1, array(), 1, 1, 1);
-cairo_curve_to($context, 1, 1, 1, array(), 1, 1);
-cairo_curve_to($context, 1, 1, 1, 1, array(), 1);
-cairo_curve_to($context, 1, 1, 1, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 0 given in %s on line %d
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 1 given in %s on line %d
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 2 given in %s on line %d
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 3 given in %s on line %d
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 4 given in %s on line %d
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 5 given in %s on line %d
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 6 given in %s on line %d
-
-Warning: cairo_curve_to() expects exactly 7 parameters, 8 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_curve_to() must be an instance of CairoContext, integer given
-
-Warning: cairo_curve_to() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_curve_to() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_curve_to() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_curve_to() expects parameter 4 to be double, array given in %s on line %d
-
-Warning: cairo_curve_to() expects parameter 5 to be double, array given in %s on line %d
-
-Warning: cairo_curve_to() expects parameter 6 to be double, array given in %s on line %d
-
-Warning: cairo_curve_to() expects parameter 7 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_get_current_point.phpt b/tests/CairoContext/Paths/cairo_get_current_point.phpt
deleted file mode 100644
index d1df1bb8..00000000
--- a/tests/CairoContext/Paths/cairo_get_current_point.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_get_current_point() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_current_point($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_get_current_point();
-cairo_get_current_point($context, 1);
-
-// check arg types, should be context object
-cairo_get_current_point(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(0)
-}
-
-Warning: cairo_get_current_point() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_current_point() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_current_point() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_current_point() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_glyph_path.phpt b/tests/CairoContext/Paths/cairo_glyph_path.phpt
deleted file mode 100644
index cb22edd2..00000000
--- a/tests/CairoContext/Paths/cairo_glyph_path.phpt
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-cairo_glyph_path() function
---SKIPIF--
-<?php
-die('skip - Cairo glyph support not available');
-?>
---FILE--
-<?php
-
-?>
---EXPECTF--
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_has_current_point.phpt b/tests/CairoContext/Paths/cairo_has_current_point.phpt
deleted file mode 100644
index e24f510b..00000000
--- a/tests/CairoContext/Paths/cairo_has_current_point.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-cairo_has_current_point() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_has_current_point')) die('skip - cairo_has_current_point not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_has_current_point($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_has_current_point();
-cairo_has_current_point($context, 1);
-
-// check arg types, should be context object
-cairo_has_current_point(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-bool(false)
-
-Warning: cairo_has_current_point() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_has_current_point() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_has_current_point() must be an instance of CairoContext, integer given
-
-Warning: cairo_has_current_point() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_line_to.phpt b/tests/CairoContext/Paths/cairo_line_to.phpt
deleted file mode 100644
index d2ff0d0a..00000000
--- a/tests/CairoContext/Paths/cairo_line_to.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_line_to() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_line_to($context, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_line_to();
-cairo_line_to($context);
-cairo_line_to($context, 1);
-cairo_line_to($context, 1, 1, 1);
-
-/* wrong types */
-cairo_line_to(1, 1, 1);
-cairo_line_to($context, array(), 1);
-cairo_line_to($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_line_to() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_line_to() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_line_to() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_line_to() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_line_to() must be an instance of CairoContext, integer given
-
-Warning: cairo_line_to() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_line_to() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_line_to() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_move_to.phpt b/tests/CairoContext/Paths/cairo_move_to.phpt
deleted file mode 100644
index 1e8f5536..00000000
--- a/tests/CairoContext/Paths/cairo_move_to.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_move_to() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_move_to($context, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_move_to();
-cairo_move_to($context);
-cairo_move_to($context, 1);
-cairo_move_to($context, 1, 1, 1);
-
-/* wrong types */
-cairo_move_to(1, 1, 1);
-cairo_move_to($context, array(), 1);
-cairo_move_to($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_move_to() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_move_to() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_move_to() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_move_to() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_move_to() must be an instance of CairoContext, integer given
-
-Warning: cairo_move_to() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_move_to() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_move_to() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_new_path.phpt b/tests/CairoContext/Paths/cairo_new_path.phpt
deleted file mode 100644
index 0c21923a..00000000
--- a/tests/CairoContext/Paths/cairo_new_path.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-cairo_new_path() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_line_to($context, 5, 5);
-
-var_dump(cairo_get_current_point($context));
-
-cairo_new_path($context);
-
-var_dump(cairo_get_current_point($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_new_path();
-cairo_new_path($context, 1);
-
-// check arg types, should be context object
-cairo_new_path(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(5)
-  [1]=>
-  float(5)
-}
-array(2) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(0)
-}
-
-Warning: cairo_new_path() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_new_path() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_new_path() must be an instance of CairoContext, integer given
-
-Warning: cairo_new_path() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_new_sub_path.phpt b/tests/CairoContext/Paths/cairo_new_sub_path.phpt
deleted file mode 100644
index a0054fc7..00000000
--- a/tests/CairoContext/Paths/cairo_new_sub_path.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-cairo_new_sub_path() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_line_to($context, 5, 5);
-
-var_dump(cairo_get_current_point($context));
-
-cairo_new_sub_path($context);
-
-var_dump(cairo_get_current_point($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_new_sub_path();
-cairo_new_sub_path($context, 1);
-
-// check arg types, should be context object
-cairo_new_sub_path(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(5)
-  [1]=>
-  float(5)
-}
-array(2) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(0)
-}
-
-Warning: cairo_new_sub_path() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_new_sub_path() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_new_sub_path() must be an instance of CairoContext, integer given
-
-Warning: cairo_new_sub_path() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_path_extents.phpt b/tests/CairoContext/Paths/cairo_path_extents.phpt
deleted file mode 100644
index c306df0f..00000000
--- a/tests/CairoContext/Paths/cairo_path_extents.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-cairo_path_extents() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_path_extents')) die('skip - cairo_path_extents not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_path_extents($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_path_extents();
-cairo_path_extents($context, 1);
-
-// check arg types, should be context object, string
-cairo_path_extents(array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(4) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(0)
-  [2]=>
-  float(0)
-  [3]=>
-  float(0)
-}
-
-Warning: cairo_path_extents() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_path_extents() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_path_extents() must be an instance of CairoContext, array given
-
-Warning: cairo_path_extents() expects parameter 1 to be CairoContext, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_rectangle.phpt b/tests/CairoContext/Paths/cairo_rectangle.phpt
deleted file mode 100644
index 8146d5ba..00000000
--- a/tests/CairoContext/Paths/cairo_rectangle.phpt
+++ /dev/null
@@ -1,65 +0,0 @@
---TEST--
-cairo_rectangle() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_rectangle($context, 1, 1, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_rectangle();
-cairo_rectangle($context);
-cairo_rectangle($context, 1);
-cairo_rectangle($context, 1, 1);
-cairo_rectangle($context, 1, 1, 1);
-cairo_rectangle($context, 1, 1, 1, 1, 1);
-
-/* wrong types */
-cairo_rectangle(1, 1, 1, 1, 1);
-cairo_rectangle($context, array(), 1, 1, 1);
-cairo_rectangle($context, 1, array(), 1, 1);
-cairo_rectangle($context, 1, 1, array(), 1);
-cairo_rectangle($context, 1, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_rectangle() expects exactly 5 parameters, 0 given in %s on line %d
-
-Warning: cairo_rectangle() expects exactly 5 parameters, 1 given in %s on line %d
-
-Warning: cairo_rectangle() expects exactly 5 parameters, 2 given in %s on line %d
-
-Warning: cairo_rectangle() expects exactly 5 parameters, 3 given in %s on line %d
-
-Warning: cairo_rectangle() expects exactly 5 parameters, 4 given in %s on line %d
-
-Warning: cairo_rectangle() expects exactly 5 parameters, 6 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_rectangle() must be an instance of CairoContext, integer given
-
-Warning: cairo_rectangle() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_rectangle() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_rectangle() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_rectangle() expects parameter 4 to be double, array given in %s on line %d
-
-Warning: cairo_rectangle() expects parameter 5 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_rel_curve_to.phpt b/tests/CairoContext/Paths/cairo_rel_curve_to.phpt
deleted file mode 100644
index 75cab9ea..00000000
--- a/tests/CairoContext/Paths/cairo_rel_curve_to.phpt
+++ /dev/null
@@ -1,78 +0,0 @@
---TEST--
-cairo_rel_curve_to() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_curve_to($context, 0, 0, 1, 0, 1, 1);
-cairo_rel_curve_to($context, 0, 0, 1, 0, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_rel_curve_to();
-cairo_rel_curve_to($context);
-cairo_rel_curve_to($context, 1);
-cairo_rel_curve_to($context, 1, 1);
-cairo_rel_curve_to($context, 1, 1, 1);
-cairo_rel_curve_to($context, 1, 1, 1, 1);
-cairo_rel_curve_to($context, 1, 1, 1, 1, 1);
-cairo_rel_curve_to($context, 1, 1, 1, 1, 1, 1, 1);
-
-/* wrong types */
-cairo_rel_curve_to(1, 1, 1, 1, 1, 1, 1);
-cairo_rel_curve_to($context, array(), 1, 1, 1, 1, 1);
-cairo_rel_curve_to($context, 1, array(), 1, 1, 1, 1);
-cairo_rel_curve_to($context, 1, 1, array(), 1, 1, 1);
-cairo_rel_curve_to($context, 1, 1, 1, array(), 1, 1);
-cairo_rel_curve_to($context, 1, 1, 1, 1, array(), 1);
-cairo_rel_curve_to($context, 1, 1, 1, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 0 given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 1 given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 2 given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 3 given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 4 given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 5 given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 6 given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects exactly 7 parameters, 8 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_rel_curve_to() must be an instance of CairoContext, integer given
-
-Warning: cairo_rel_curve_to() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects parameter 4 to be double, array given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects parameter 5 to be double, array given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects parameter 6 to be double, array given in %s on line %d
-
-Warning: cairo_rel_curve_to() expects parameter 7 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_rel_line_to.phpt b/tests/CairoContext/Paths/cairo_rel_line_to.phpt
deleted file mode 100644
index e8b1fc58..00000000
--- a/tests/CairoContext/Paths/cairo_rel_line_to.phpt
+++ /dev/null
@@ -1,55 +0,0 @@
---TEST--
-cairo_rel_line_to() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_line_to($context, 1, 1);
-
-cairo_rel_line_to($context, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_rel_line_to();
-cairo_rel_line_to($context);
-cairo_rel_line_to($context, 1);
-cairo_rel_line_to($context, 1, 1, 1);
-
-/* wrong types */
-cairo_rel_line_to(1, 1, 1);
-cairo_rel_line_to($context, array(), 1);
-cairo_rel_line_to($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_rel_line_to() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_rel_line_to() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_rel_line_to() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_rel_line_to() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_rel_line_to() must be an instance of CairoContext, integer given
-
-Warning: cairo_rel_line_to() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_rel_line_to() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_rel_line_to() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_rel_move_to.phpt b/tests/CairoContext/Paths/cairo_rel_move_to.phpt
deleted file mode 100644
index 5b82fa77..00000000
--- a/tests/CairoContext/Paths/cairo_rel_move_to.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-cairo_rel_move_to() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_move_to($context, 1, 1);
-cairo_rel_move_to($context, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_rel_move_to();
-cairo_rel_move_to($context);
-cairo_rel_move_to($context, 1);
-cairo_rel_move_to($context, 1, 1, 1);
-
-/* wrong types */
-cairo_rel_move_to(1, 1, 1);
-cairo_rel_move_to($context, array(), 1);
-cairo_rel_move_to($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_rel_move_to() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_rel_move_to() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_rel_move_to() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_rel_move_to() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_rel_move_to() must be an instance of CairoContext, integer given
-
-Warning: cairo_rel_move_to() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_rel_move_to() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_rel_move_to() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/cairo_text_path.phpt b/tests/CairoContext/Paths/cairo_text_path.phpt
deleted file mode 100644
index 04f4de7d..00000000
--- a/tests/CairoContext/Paths/cairo_text_path.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_text_path() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_text_path($context, 'foobar');
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_text_path();
-cairo_text_path($context);
-cairo_text_path($context, 'foobar', 1);
-
-// check arg types, should be context object, string
-cairo_text_path(array(), 'foobar');
-cairo_text_path($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_text_path() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_text_path() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_text_path() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_text_path() must be an instance of CairoContext, array given
-
-Warning: cairo_text_path() expects parameter 1 to be CairoContext, array given in %s on line %d
-
-Warning: cairo_text_path() expects parameter 2 to be string, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/closePath.phpt b/tests/CairoContext/Paths/closePath.phpt
index ce51db04..00882724 100644
--- a/tests/CairoContext/Paths/closePath.phpt
+++ b/tests/CairoContext/Paths/closePath.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->closePath() method
+Cairo\Context->closePath() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->closePath();
@@ -18,13 +18,13 @@ $context->closePath();
 try {
     $context->closePath('foo');
     trigger_error('newPath requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::closePath() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::closePath() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/copyPath.phpt b/tests/CairoContext/Paths/copyPath.phpt
index 15bf10c6..76d977e0 100644
--- a/tests/CairoContext/Paths/copyPath.phpt
+++ b/tests/CairoContext/Paths/copyPath.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->copyPath() method
+Cairo\Context->copyPath() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->copyPath());
@@ -18,15 +18,15 @@ var_dump($context->copyPath());
 try {
     $context->copyPath('foo');
     trigger_error('identityMatrix requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoPath)#%d (0) {
+object(Cairo\Path)#%d (0) {
 }
-CairoContext::copyPath() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::copyPath() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/copyPathFlat.phpt b/tests/CairoContext/Paths/copyPathFlat.phpt
index 1772bf02..9fe49b8e 100644
--- a/tests/CairoContext/Paths/copyPathFlat.phpt
+++ b/tests/CairoContext/Paths/copyPathFlat.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->copyPathFlat() method
+Cairo\Context->copyPathFlat() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->copyPathFlat());
@@ -18,15 +18,15 @@ var_dump($context->copyPathFlat());
 try {
     $context->copyPathFlat('foo');
     trigger_error('identityMatrix requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoPath)#%d (0) {
+object(Cairo\Path)#%d (0) {
 }
-CairoContext::copyPathFlat() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::copyPathFlat() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/curveTo.phpt b/tests/CairoContext/Paths/curveTo.phpt
index ff8c355f..9898f4bf 100644
--- a/tests/CairoContext/Paths/curveTo.phpt
+++ b/tests/CairoContext/Paths/curveTo.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->curveTo() method
+Cairo\Context->curveTo() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::curveTo() expects 5 parameters!');
+	trigger_error('Cairo\Context::curveTo() expects 5 parameters!');
 }
 
 $context->curveTo(0, 0, 1, 0, 1, 1);
@@ -24,7 +24,7 @@ try {
     $context->curveTo();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
     $context->curveTo(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
     $context->curveTo(1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -48,7 +48,7 @@ try {
     $context->curveTo(1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -56,7 +56,7 @@ try {
     $context->curveTo(1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -64,7 +64,7 @@ try {
     $context->curveTo(1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -72,7 +72,7 @@ try {
     $context->curveTo(1,1,1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -81,7 +81,7 @@ try {
     $context->curveTo(array(),1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -89,7 +89,7 @@ try {
     $context->curveTo(1,array(),1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -97,7 +97,7 @@ try {
     $context->curveTo(1,1,array(),1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -105,7 +105,7 @@ try {
     $context->curveTo(1,1,1,array(),1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -113,7 +113,7 @@ try {
     $context->curveTo(1,1,1,1,array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -121,25 +121,25 @@ try {
     $context->curveTo(1,1,1,1,1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-CairoContext::curveTo() expects exactly 6 parameters, 0 given
-CairoContext::curveTo() expects exactly 6 parameters, 1 given
-CairoContext::curveTo() expects exactly 6 parameters, 2 given
-CairoContext::curveTo() expects exactly 6 parameters, 3 given
-CairoContext::curveTo() expects exactly 6 parameters, 4 given
-CairoContext::curveTo() expects exactly 6 parameters, 5 given
-CairoContext::curveTo() expects exactly 6 parameters, 7 given
-CairoContext::curveTo() expects parameter 1 to be double, array given
-CairoContext::curveTo() expects parameter 2 to be double, array given
-CairoContext::curveTo() expects parameter 3 to be double, array given
-CairoContext::curveTo() expects parameter 4 to be double, array given
-CairoContext::curveTo() expects parameter 5 to be double, array given
-CairoContext::curveTo() expects parameter 6 to be double, array given
\ No newline at end of file
+object(Cairo\Surface\Image)#%d (0) {
+}
+object(Cairo\Context)#%d (0) {
+}
+Cairo\Context::curveTo() expects exactly 6 parameters, 0 given
+Cairo\Context::curveTo() expects exactly 6 parameters, 1 given
+Cairo\Context::curveTo() expects exactly 6 parameters, 2 given
+Cairo\Context::curveTo() expects exactly 6 parameters, 3 given
+Cairo\Context::curveTo() expects exactly 6 parameters, 4 given
+Cairo\Context::curveTo() expects exactly 6 parameters, 5 given
+Cairo\Context::curveTo() expects exactly 6 parameters, 7 given
+Cairo\Context::curveTo() expects parameter 1 to be float, array given
+Cairo\Context::curveTo() expects parameter 2 to be float, array given
+Cairo\Context::curveTo() expects parameter 3 to be float, array given
+Cairo\Context::curveTo() expects parameter 4 to be float, array given
+Cairo\Context::curveTo() expects parameter 5 to be float, array given
+Cairo\Context::curveTo() expects parameter 6 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/getCurrentPoint.phpt b/tests/CairoContext/Paths/getCurrentPoint.phpt
index f8b3e624..01f7cf67 100644
--- a/tests/CairoContext/Paths/getCurrentPoint.phpt
+++ b/tests/CairoContext/Paths/getCurrentPoint.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getCurrentPoint() method
+Cairo\Context->getCurrentPoint() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getCurrentPoint());
@@ -18,14 +18,14 @@ var_dump($context->getCurrentPoint());
 try {
     $context->getCurrentPoint('foo');
     trigger_error('hasCurrentPoint requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -33,4 +33,4 @@ array(2) {
   [1]=>
   float(0)
 }
-CairoContext::getCurrentPoint() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getCurrentPoint() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/glyphPath.phpt b/tests/CairoContext/Paths/glyphPath.phpt
index 268302a9..41cec7f1 100644
--- a/tests/CairoContext/Paths/glyphPath.phpt
+++ b/tests/CairoContext/Paths/glyphPath.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoContext->glyphPath() function
+Cairo\Context->glyphPath() function
 --SKIPIF--
 <?php
 die('skip - Cairo glyph support not available');
diff --git a/tests/CairoContext/Paths/hasCurrentPoint.phpt b/tests/CairoContext/Paths/hasCurrentPoint.phpt
index 83de0a5b..44a88693 100644
--- a/tests/CairoContext/Paths/hasCurrentPoint.phpt
+++ b/tests/CairoContext/Paths/hasCurrentPoint.phpt
@@ -1,16 +1,16 @@
 --TEST--
-CairoContext->hasCurrentPoint() method
+Cairo\Context->hasCurrentPoint() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!method_exists('CairoContext', 'hasCurrentPoint')) die('skip - CairoContext->hasCurrentPoint not available');
+if(!method_exists('Cairo\Context', 'hasCurrentPoint')) die('skip - Cairo\Context->hasCurrentPoint not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->hasCurrentPoint());
@@ -19,14 +19,14 @@ var_dump($context->hasCurrentPoint());
 try {
     $context->hasCurrentPoint('foo');
     trigger_error('hasCurrentPoint requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 bool(false)
-CairoContext::hasCurrentPoint() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::hasCurrentPoint() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/lineTo.phpt b/tests/CairoContext/Paths/lineTo.phpt
index 230ae130..c2f6f4ec 100644
--- a/tests/CairoContext/Paths/lineTo.phpt
+++ b/tests/CairoContext/Paths/lineTo.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->lineTo() method
+Cairo\Context->lineTo() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::lineTo() expects 2 parameters!');
+	trigger_error('Cairo\Context::lineTo() expects 2 parameters!');
 }
 
 $context->lineTo(1, 1);
@@ -24,7 +24,7 @@ try {
     $context->lineTo();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
     $context->lineTo(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
     $context->lineTo(1,1, 1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -49,7 +49,7 @@ try {
     $context->lineTo(array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -57,17 +57,17 @@ try {
     $context->lineTo(1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::lineTo() expects exactly 2 parameters, 0 given
-CairoContext::lineTo() expects exactly 2 parameters, 1 given
-CairoContext::lineTo() expects exactly 2 parameters, 3 given
-CairoContext::lineTo() expects parameter 1 to be double, array given
-CairoContext::lineTo() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::lineTo() expects exactly 2 parameters, 0 given
+Cairo\Context::lineTo() expects exactly 2 parameters, 1 given
+Cairo\Context::lineTo() expects exactly 2 parameters, 3 given
+Cairo\Context::lineTo() expects parameter 1 to be float, array given
+Cairo\Context::lineTo() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/moveTo.phpt b/tests/CairoContext/Paths/moveTo.phpt
index d610a6c7..9de61358 100644
--- a/tests/CairoContext/Paths/moveTo.phpt
+++ b/tests/CairoContext/Paths/moveTo.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->moveTo() method
+Cairo\Context->moveTo() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::moveTo() expects 2 parameters!');
+	trigger_error('Cairo\Context::moveTo() expects 2 parameters!');
 }
 
 $context->moveTo(1, 1);
@@ -24,7 +24,7 @@ try {
     $context->moveTo();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
     $context->moveTo(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
     $context->moveTo(1,1, 1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -49,7 +49,7 @@ try {
     $context->moveTo(array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -57,17 +57,17 @@ try {
     $context->moveTo(1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::moveTo() expects exactly 2 parameters, 0 given
-CairoContext::moveTo() expects exactly 2 parameters, 1 given
-CairoContext::moveTo() expects exactly 2 parameters, 3 given
-CairoContext::moveTo() expects parameter 1 to be double, array given
-CairoContext::moveTo() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::moveTo() expects exactly 2 parameters, 0 given
+Cairo\Context::moveTo() expects exactly 2 parameters, 1 given
+Cairo\Context::moveTo() expects exactly 2 parameters, 3 given
+Cairo\Context::moveTo() expects parameter 1 to be float, array given
+Cairo\Context::moveTo() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/newPath.phpt b/tests/CairoContext/Paths/newPath.phpt
index 5528d4a6..7a856bb8 100644
--- a/tests/CairoContext/Paths/newPath.phpt
+++ b/tests/CairoContext/Paths/newPath.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->newPath() method
+Cairo\Context->newPath() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->lineTo(5, 5);
@@ -22,14 +22,14 @@ var_dump($context->getCurrentPoint());
 try {
     $context->newPath('foo');
     trigger_error('newPath requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -43,4 +43,4 @@ array(2) {
   [1]=>
   float(0)
 }
-CairoContext::newPath() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::newPath() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/newSubPath.phpt b/tests/CairoContext/Paths/newSubPath.phpt
index 128c2228..6e045d3c 100644
--- a/tests/CairoContext/Paths/newSubPath.phpt
+++ b/tests/CairoContext/Paths/newSubPath.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->newSubPath() method
+Cairo\Context->newSubPath() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->lineTo(5, 5);
@@ -22,14 +22,14 @@ var_dump($context->getCurrentPoint());
 try {
     $context->newSubPath('foo');
     trigger_error('newPath requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -43,4 +43,4 @@ array(2) {
   [1]=>
   float(0)
 }
-CairoContext::newSubPath() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::newSubPath() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/pathExtents.phpt b/tests/CairoContext/Paths/pathExtents.phpt
index 484e95c7..2eefd8f3 100644
--- a/tests/CairoContext/Paths/pathExtents.phpt
+++ b/tests/CairoContext/Paths/pathExtents.phpt
@@ -1,16 +1,16 @@
 --TEST--
-CairoContext->pathExtents() method
+Cairo\Context->pathExtents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!method_exists('CairoContext', 'pathExtents')) die('skip - CairoContext->pathExtents extension not available');
+if(!method_exists('Cairo\Context', 'pathExtents')) die('skip - Cairo\Context->pathExtents extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->pathExtents());
@@ -19,14 +19,14 @@ var_dump($context->pathExtents());
 try {
     $context->pathExtents('foobar');
     trigger_error('textExtents requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(4) {
   [0]=>
@@ -38,4 +38,4 @@ array(4) {
   [3]=>
   float(0)
 }
-CairoContext::pathExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::pathExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/rectangle.phpt b/tests/CairoContext/Paths/rectangle.phpt
index 807d4b63..f8f6c49e 100644
--- a/tests/CairoContext/Paths/rectangle.phpt
+++ b/tests/CairoContext/Paths/rectangle.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->rectangle() method
+Cairo\Context->rectangle() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::rectangle() expects 4 parameters!');
+	trigger_error('Cairo\Context::rectangle() expects 4 parameters!');
 }
 
 $context->rectangle(1, 1, 1, 1);
@@ -24,7 +24,7 @@ try {
     $context->rectangle();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
     $context->rectangle(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
     $context->rectangle(1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -48,7 +48,7 @@ try {
     $context->rectangle(1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -56,7 +56,7 @@ try {
     $context->rectangle(1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -65,7 +65,7 @@ try {
     $context->rectangle(array(),1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -73,7 +73,7 @@ try {
     $context->rectangle(1,array(),1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -81,7 +81,7 @@ try {
     $context->rectangle(1,1,array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -89,21 +89,21 @@ try {
     $context->rectangle(1,1,1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::rectangle() expects exactly 4 parameters, 0 given
-CairoContext::rectangle() expects exactly 4 parameters, 1 given
-CairoContext::rectangle() expects exactly 4 parameters, 2 given
-CairoContext::rectangle() expects exactly 4 parameters, 3 given
-CairoContext::rectangle() expects exactly 4 parameters, 5 given
-CairoContext::rectangle() expects parameter 1 to be double, array given
-CairoContext::rectangle() expects parameter 2 to be double, array given
-CairoContext::rectangle() expects parameter 3 to be double, array given
-CairoContext::rectangle() expects parameter 4 to be double, array given
\ No newline at end of file
+Cairo\Context::rectangle() expects exactly 4 parameters, 0 given
+Cairo\Context::rectangle() expects exactly 4 parameters, 1 given
+Cairo\Context::rectangle() expects exactly 4 parameters, 2 given
+Cairo\Context::rectangle() expects exactly 4 parameters, 3 given
+Cairo\Context::rectangle() expects exactly 4 parameters, 5 given
+Cairo\Context::rectangle() expects parameter 1 to be float, array given
+Cairo\Context::rectangle() expects parameter 2 to be float, array given
+Cairo\Context::rectangle() expects parameter 3 to be float, array given
+Cairo\Context::rectangle() expects parameter 4 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/relCurveTo.phpt b/tests/CairoContext/Paths/relCurveTo.phpt
index 40c778eb..cd133856 100644
--- a/tests/CairoContext/Paths/relCurveTo.phpt
+++ b/tests/CairoContext/Paths/relCurveTo.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->relCurveTo() method
+Cairo\Context->relCurveTo() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::relCurveTo() expects 5 parameters!');
+	trigger_error('Cairo\Context::relCurveTo() expects 5 parameters!');
 }
 
 $context->curveTo(0, 0, 1, 0, 1, 1);
@@ -25,7 +25,7 @@ try {
     $context->relCurveTo();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -33,7 +33,7 @@ try {
     $context->relCurveTo(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -41,7 +41,7 @@ try {
     $context->relCurveTo(1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -49,7 +49,7 @@ try {
     $context->relCurveTo(1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -57,7 +57,7 @@ try {
     $context->relCurveTo(1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -65,7 +65,7 @@ try {
     $context->relCurveTo(1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -73,7 +73,7 @@ try {
     $context->relCurveTo(1,1,1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -82,7 +82,7 @@ try {
     $context->relCurveTo(array(),1,1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -90,7 +90,7 @@ try {
     $context->relCurveTo(1,array(),1,1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -98,7 +98,7 @@ try {
     $context->relCurveTo(1,1,array(),1,1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -106,7 +106,7 @@ try {
     $context->relCurveTo(1,1,1,array(),1,1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -114,7 +114,7 @@ try {
     $context->relCurveTo(1,1,1,1,array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -122,25 +122,25 @@ try {
     $context->relCurveTo(1,1,1,1,1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-CairoContext::relCurveTo() expects exactly 6 parameters, 0 given
-CairoContext::relCurveTo() expects exactly 6 parameters, 1 given
-CairoContext::relCurveTo() expects exactly 6 parameters, 2 given
-CairoContext::relCurveTo() expects exactly 6 parameters, 3 given
-CairoContext::relCurveTo() expects exactly 6 parameters, 4 given
-CairoContext::relCurveTo() expects exactly 6 parameters, 5 given
-CairoContext::relCurveTo() expects exactly 6 parameters, 7 given
-CairoContext::relCurveTo() expects parameter 1 to be double, array given
-CairoContext::relCurveTo() expects parameter 2 to be double, array given
-CairoContext::relCurveTo() expects parameter 3 to be double, array given
-CairoContext::relCurveTo() expects parameter 4 to be double, array given
-CairoContext::relCurveTo() expects parameter 5 to be double, array given
-CairoContext::relCurveTo() expects parameter 6 to be double, array given
\ No newline at end of file
+object(Cairo\Surface\Image)#%d (0) {
+}
+object(Cairo\Context)#%d (0) {
+}
+Cairo\Context::relCurveTo() expects exactly 6 parameters, 0 given
+Cairo\Context::relCurveTo() expects exactly 6 parameters, 1 given
+Cairo\Context::relCurveTo() expects exactly 6 parameters, 2 given
+Cairo\Context::relCurveTo() expects exactly 6 parameters, 3 given
+Cairo\Context::relCurveTo() expects exactly 6 parameters, 4 given
+Cairo\Context::relCurveTo() expects exactly 6 parameters, 5 given
+Cairo\Context::relCurveTo() expects exactly 6 parameters, 7 given
+Cairo\Context::relCurveTo() expects parameter 1 to be float, array given
+Cairo\Context::relCurveTo() expects parameter 2 to be float, array given
+Cairo\Context::relCurveTo() expects parameter 3 to be float, array given
+Cairo\Context::relCurveTo() expects parameter 4 to be float, array given
+Cairo\Context::relCurveTo() expects parameter 5 to be float, array given
+Cairo\Context::relCurveTo() expects parameter 6 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/relLineTo.phpt b/tests/CairoContext/Paths/relLineTo.phpt
index f39b3222..ae0907fc 100644
--- a/tests/CairoContext/Paths/relLineTo.phpt
+++ b/tests/CairoContext/Paths/relLineTo.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->relLineTo() method
+Cairo\Context->relLineTo() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::relLineTo() expects 2 parameters!');
+	trigger_error('Cairo\Context::relLineTo() expects 2 parameters!');
 }
 
 $context->lineTo(1, 1);
@@ -25,7 +25,7 @@ try {
     $context->relLineTo();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -33,7 +33,7 @@ try {
     $context->relLineTo(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -41,7 +41,7 @@ try {
     $context->relLineTo(1,1, 1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -50,7 +50,7 @@ try {
     $context->relLineTo(array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -58,17 +58,17 @@ try {
     $context->relLineTo(1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::relLineTo() expects exactly 2 parameters, 0 given
-CairoContext::relLineTo() expects exactly 2 parameters, 1 given
-CairoContext::relLineTo() expects exactly 2 parameters, 3 given
-CairoContext::relLineTo() expects parameter 1 to be double, array given
-CairoContext::relLineTo() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::relLineTo() expects exactly 2 parameters, 0 given
+Cairo\Context::relLineTo() expects exactly 2 parameters, 1 given
+Cairo\Context::relLineTo() expects exactly 2 parameters, 3 given
+Cairo\Context::relLineTo() expects parameter 1 to be float, array given
+Cairo\Context::relLineTo() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/relMoveTo.phpt b/tests/CairoContext/Paths/relMoveTo.phpt
index b7ab73cc..b6642993 100644
--- a/tests/CairoContext/Paths/relMoveTo.phpt
+++ b/tests/CairoContext/Paths/relMoveTo.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->relMoveTo() method
+Cairo\Context->relMoveTo() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 function trig_err()
 {
-	trigger_error('CairoContext::relMoveTo() expects 2 parameters!');
+	trigger_error('Cairo\Context::relMoveTo() expects 2 parameters!');
 }
 
 $context->moveTo(1, 1);
@@ -25,7 +25,7 @@ try {
     $context->relMoveTo();
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -33,7 +33,7 @@ try {
     $context->relMoveTo(1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -41,7 +41,7 @@ try {
     $context->relMoveTo(1,1, 1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -50,7 +50,7 @@ try {
     $context->relMoveTo(array(),1);
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -58,17 +58,17 @@ try {
     $context->relMoveTo(1,array());
     trig_err();
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::relMoveTo() expects exactly 2 parameters, 0 given
-CairoContext::relMoveTo() expects exactly 2 parameters, 1 given
-CairoContext::relMoveTo() expects exactly 2 parameters, 3 given
-CairoContext::relMoveTo() expects parameter 1 to be double, array given
-CairoContext::relMoveTo() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::relMoveTo() expects exactly 2 parameters, 0 given
+Cairo\Context::relMoveTo() expects exactly 2 parameters, 1 given
+Cairo\Context::relMoveTo() expects exactly 2 parameters, 3 given
+Cairo\Context::relMoveTo() expects parameter 1 to be float, array given
+Cairo\Context::relMoveTo() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Paths/textPath.phpt b/tests/CairoContext/Paths/textPath.phpt
index 46398c59..7d212683 100644
--- a/tests/CairoContext/Paths/textPath.phpt
+++ b/tests/CairoContext/Paths/textPath.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->textPath() method
+Cairo\Context->textPath() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->textPath('foobar');
@@ -18,7 +18,7 @@ $context->textPath('foobar');
 try {
     $context->textPath();
     trigger_error('textPath requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->textPath('foo', 1);
     trigger_error('textPath requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,15 +34,15 @@ try {
 try {
     $context->textPath(array());
     trigger_error('textPath requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::textPath() expects exactly 1 parameter, 0 given
-CairoContext::textPath() expects exactly 1 parameter, 2 given
-CairoContext::textPath() expects parameter 1 to be string, array given
\ No newline at end of file
+Cairo\Context::textPath() expects exactly 1 parameter, 0 given
+Cairo\Context::textPath() expects exactly 1 parameter, 2 given
+Cairo\Context::textPath() expects parameter 1 to be string, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_font_extents.phpt b/tests/CairoContext/Text/cairo_font_extents.phpt
deleted file mode 100644
index 10f4d886..00000000
--- a/tests/CairoContext/Text/cairo_font_extents.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_font_extents() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_font_extents($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_extents();
-cairo_font_extents($context, 1);
-
-// check arg types, should be context object
-cairo_font_extents(array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(5) {
-  ["ascent"]=>
-  float(%f)
-  ["descent"]=>
-  float(%f)
-  ["height"]=>
-  float(%f)
-  ["max_x_advance"]=>
-  float(%f)
-  ["max_y_advance"]=>
-  float(%f)
-}
-
-Warning: cairo_font_extents() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_extents() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_extents() must be an instance of CairoContext, array given
-
-Warning: cairo_font_extents() expects parameter 1 to be CairoContext, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_get_font_face.phpt b/tests/CairoContext/Text/cairo_get_font_face.phpt
deleted file mode 100644
index 79ea3f3d..00000000
--- a/tests/CairoContext/Text/cairo_get_font_face.phpt
+++ /dev/null
@@ -1,55 +0,0 @@
---TEST--
-cairo_get_font_face() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump($orig_face = cairo_get_font_face($context));
-
-include(dirname(__FILE__) . '/create_toyfont.inc');
-
-cairo_set_font_face($context, $fontface);
-var_dump($face1 = cairo_get_font_face($context));
-var_dump($face1 === $fontface);
-var_dump($orig_face === $face1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_font_face();
-cairo_get_font_face($context, 1);
-
-// check arg types, should be context object
-cairo_get_font_face(array());
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-bool(true)
-bool(false)
-
-Warning: cairo_get_font_face() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_font_face() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_font_face() must be an instance of CairoContext, array given
-
-Warning: cairo_get_font_face() expects parameter 1 to be CairoContext, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_get_font_matrix.phpt b/tests/CairoContext/Text/cairo_get_font_matrix.phpt
deleted file mode 100644
index 4bdb1863..00000000
--- a/tests/CairoContext/Text/cairo_get_font_matrix.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-cairo_get_font_matrix() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump($orig_matrix = cairo_get_font_matrix($context));
-
-$matrix = cairo_matrix_init(5, 5);
-var_dump($matrix);
-var_dump($orig_matrix === $matrix);
-
-cairo_set_font_matrix($context, $matrix);
-var_dump($matrix1 = cairo_get_font_matrix($context));
-var_dump($matrix1 === $matrix);
-var_dump($orig_matrix === $matrix);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_font_matrix();
-cairo_get_font_matrix($context, 1);
-
-// check arg types, should be context object
-cairo_get_font_matrix(array());
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-bool(false)
-object(CairoMatrix)#%d (0) {
-}
-bool(true)
-bool(false)
-
-Warning: cairo_get_font_matrix() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_font_matrix() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_font_matrix() must be an instance of CairoContext, array given
-
-Warning: cairo_get_font_matrix() expects parameter 1 to be CairoContext, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_get_font_options.phpt b/tests/CairoContext/Text/cairo_get_font_options.phpt
deleted file mode 100644
index e8df4569..00000000
--- a/tests/CairoContext/Text/cairo_get_font_options.phpt
+++ /dev/null
@@ -1,57 +0,0 @@
---TEST--
-cairo_get_font_options() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump($orig_options = cairo_get_font_options($context));
-
-$options = cairo_font_options_create();
-var_dump($orig_options === $options);
-
-cairo_set_font_options($context, $options);
-var_dump($options1 = cairo_get_font_options($context));
-var_dump($options1 === $options);
-var_dump($orig_options === $options1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_font_options();
-cairo_get_font_options($context, 1);
-
-// check arg types, should be context object
-cairo_get_font_options(array());
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoFontOptions)#%d (0) {
-}
-bool(false)
-object(CairoFontOptions)#%d (0) {
-}
-bool(true)
-bool(false)
-
-Warning: cairo_get_font_options() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_font_options() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_font_options() must be an instance of CairoContext, array given
-
-Warning: cairo_get_font_options() expects parameter 1 to be CairoContext, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_get_scaled_font.phpt b/tests/CairoContext/Text/cairo_get_scaled_font.phpt
deleted file mode 100644
index f257ffc0..00000000
--- a/tests/CairoContext/Text/cairo_get_scaled_font.phpt
+++ /dev/null
@@ -1,58 +0,0 @@
---TEST--
-cairo_get_scaled_font() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_scaled_font($context));
-
-/* create scaled font with new font face, font options, matrix */
-include(dirname(__FILE__) . '/create_toyfont.inc');
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaled = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-
-cairo_set_scaled_font($context, $scaled);
-var_dump(cairo_get_scaled_font($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - wants 1
-cairo_get_scaled_font();
-cairo_get_scaled_font($context, 1);
-
-// check arg types, should be CairoContext
-cairo_get_scaled_font(array());
-
-//die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-
-Warning: cairo_get_scaled_font() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_scaled_font() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_scaled_font() must be an instance of CairoContext, array given
-
-Warning: cairo_get_scaled_font() expects parameter 1 to be CairoContext, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_select_font_face.phpt b/tests/CairoContext/Text/cairo_select_font_face.phpt
deleted file mode 100644
index 46bd644a..00000000
--- a/tests/CairoContext/Text/cairo_select_font_face.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_select_font_face() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_select_font_face($context, 'sans-serif');
-$fontface = cairo_get_font_face($context);
-var_dump($fontface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_select_font_face();
-cairo_select_font_face($context);
-cairo_select_font_face($context, 'foobar', 1);
-
-// check arg types, should be context object, string
-cairo_select_font_face(array(), 'foobar');
-cairo_select_font_face($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-
-Warning: cairo_select_font_face() expects at least 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_select_font_face() expects at least 2 parameters, 1 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_select_font_face() must be an instance of CairoContext, array given
-
-Warning: cairo_select_font_face() expects parameter 1 to be CairoContext, array given in %s on line %d
-
-Warning: cairo_select_font_face() expects parameter 2 to be string, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_set_font_face.phpt b/tests/CairoContext/Text/cairo_set_font_face.phpt
deleted file mode 100644
index e56ea831..00000000
--- a/tests/CairoContext/Text/cairo_set_font_face.phpt
+++ /dev/null
@@ -1,67 +0,0 @@
---TEST--
-cairo_set_font_face() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-cairo_set_font_face($context, $fontface);
-$fontface1 = cairo_get_font_face($context);
-
-var_dump($fontface === $fontface1);
-
-include(dirname(__FILE__) . '/create_toyfont.inc');
-
-cairo_set_font_face($context, $fontface);
-$fontface1 = cairo_get_font_face($context);
-
-var_dump($fontface1 === $fontface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_set_font_face();
-cairo_set_font_face($context);
-cairo_set_font_face($context, $fontface, 1);
-
-// check arg types, should be context object, cairo matrix
-cairo_set_font_face(array(), $fontface);
-cairo_set_font_face($context, array());
-
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-bool(true)
-bool(true)
-
-Warning: cairo_set_font_face() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_font_face() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_font_face() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_font_face() must be an instance of CairoContext, array given
-
-Warning: cairo_set_font_face() expects parameter 1 to be CairoContext, array given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_font_face() must be an instance of CairoFontFace, array given
-
-Warning: cairo_set_font_face() expects parameter 2 to be CairoFontFace, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_set_font_matrix.phpt b/tests/CairoContext/Text/cairo_set_font_matrix.phpt
deleted file mode 100644
index 7facff8f..00000000
--- a/tests/CairoContext/Text/cairo_set_font_matrix.phpt
+++ /dev/null
@@ -1,66 +0,0 @@
---TEST--
-cairo_set_font_matrix() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$matrix = cairo_matrix_init();
-var_dump($matrix);
-
-cairo_set_font_matrix($context, $matrix);
-$matrix1 = cairo_get_font_matrix($context);
-
-var_dump($matrix === $matrix1);
-
-$matrix2 = cairo_matrix_init(5, 5);
-cairo_set_font_matrix($context, $matrix2);
-$matrix1 = cairo_get_font_matrix($context);
-
-var_dump($matrix2 === $matrix1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_set_font_matrix();
-cairo_set_font_matrix($context);
-cairo_set_font_matrix($context, $matrix2, 1);
-
-// check arg types, should be context object, cairo matrix
-cairo_set_font_matrix(array(), $matrix2);
-cairo_set_font_matrix($context, array());
-
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-bool(true)
-bool(true)
-
-Warning: cairo_set_font_matrix() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_font_matrix() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_font_matrix() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_font_matrix() must be an instance of CairoContext, array given
-
-Warning: cairo_set_font_matrix() expects parameter 1 to be CairoContext, array given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_font_matrix() must be an instance of CairoMatrix, array given
-
-Warning: cairo_set_font_matrix() expects parameter 2 to be CairoMatrix, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_set_font_options.phpt b/tests/CairoContext/Text/cairo_set_font_options.phpt
deleted file mode 100644
index 925a60ee..00000000
--- a/tests/CairoContext/Text/cairo_set_font_options.phpt
+++ /dev/null
@@ -1,66 +0,0 @@
---TEST--
-cairo_set_font_options() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$options = cairo_font_options_create();
-var_dump($options);
-
-cairo_set_font_options($context, $options);
-$options1 = cairo_get_font_options($context);
-
-var_dump($options === $options1);
-
-$options2 = cairo_font_options_create();
-cairo_set_font_options($context, $options2);
-$options1 = cairo_get_font_options($context);
-
-var_dump($options2 === $options1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_set_font_options();
-cairo_set_font_options($context);
-cairo_set_font_options($context, $options2, 1);
-
-// check arg types, should be context object, cairo matrix
-cairo_set_font_options(array(), $options2);
-cairo_set_font_options($context, array());
-
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoFontOptions)#%d (0) {
-}
-bool(true)
-bool(true)
-
-Warning: cairo_set_font_options() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_font_options() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_font_options() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_font_options() must be an instance of CairoContext, array given
-
-Warning: cairo_set_font_options() expects parameter 1 to be CairoContext, array given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_font_options() must be an instance of CairoFontOptions, array given
-
-Warning: cairo_set_font_options() expects parameter 2 to be CairoFontOptions, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_set_font_size.phpt b/tests/CairoContext/Text/cairo_set_font_size.phpt
deleted file mode 100644
index e4ea7a6c..00000000
--- a/tests/CairoContext/Text/cairo_set_font_size.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-cairo_set_font_size() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_font_size($context, 15);
-
-cairo_set_font_matrix($context, cairo_matrix_init(5, 15));
-
-cairo_set_font_size($context, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_set_font_size();
-cairo_set_font_size($context);
-cairo_set_font_size($context, 1, 1);
-
-// check arg types, should be context object, double
-cairo_set_font_size(array(), 1);
-cairo_set_font_size($context, array());
-
-// DO NOT REMOVE: workaround for GC-related bug in 5.3 
-die;
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_set_font_size() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_font_size() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_font_size() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_font_size() must be an instance of CairoContext, array given
-
-Warning: cairo_set_font_size() expects parameter 1 to be CairoContext, array given in %s on line %d
-
-Warning: cairo_set_font_size() expects parameter 2 to be double, array given in %s on line %d
diff --git a/tests/CairoContext/Text/cairo_set_scaled_font.phpt b/tests/CairoContext/Text/cairo_set_scaled_font.phpt
deleted file mode 100644
index aa3f41f4..00000000
--- a/tests/CairoContext/Text/cairo_set_scaled_font.phpt
+++ /dev/null
@@ -1,98 +0,0 @@
---TEST--
-cairo_set_scaled_font() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-/* set font face, font options, matrix */
-$orig_matrix = cairo_matrix_init();
-cairo_set_matrix($context, $orig_matrix);
-$orig_options = cairo_font_options_create();
-cairo_set_font_options($context, $orig_options);
-include(dirname(__FILE__) . '/create_toyfont.inc');
-$orig_fontface = $fontface;
-cairo_set_font_face($context, $orig_fontface);
-
-/* create scaled font with new font face, font options, matrix */
-include(dirname(__FILE__) . '/create_toyfont.inc');
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaled = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaled);
-
-cairo_set_scaled_font($context, $scaled);
-
-/* compare new values to original values */
-var_dump($matrix1 === $orig_matrix);
-var_dump($fontface === $orig_fontface);
-var_dump($options === $orig_options);
-
-/* compare matrix, font face, font options, scaled font */
-var_dump($matrix1 === cairo_get_font_matrix($context));
-var_dump($fontface === cairo_get_font_face($context));
-var_dump($options === cairo_get_font_options($context));
-var_dump($scaled === cairo_get_scaled_font($context));
-
-/* create scaled font with new font face, font options, matrix */
-include(dirname(__FILE__) . '/create_toyfont.inc');
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaled = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-
-cairo_set_scaled_font($context, $scaled);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - wants 2
-cairo_set_scaled_font();
-cairo_set_scaled_font($context);
-cairo_set_scaled_font($context, $scaled, 1);
-
-// check arg types, should be CairoContext, CairoScaledFont
-cairo_set_scaled_font(array(), $scaled);
-cairo_set_scaled_font($context, array());
-
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-
-Warning: cairo_set_scaled_font() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_scaled_font() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_scaled_font() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_scaled_font() must be an instance of CairoContext, array given
-
-Warning: cairo_set_scaled_font() expects parameter 1 to be CairoContext, array given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_scaled_font() must be an instance of CairoScaledFont, array given
-
-Warning: cairo_set_scaled_font() expects parameter 2 to be CairoScaledFont, array given in %s on line %d
diff --git a/tests/CairoContext/Text/cairo_show_text.phpt b/tests/CairoContext/Text/cairo_show_text.phpt
deleted file mode 100644
index 1bc9a34f..00000000
--- a/tests/CairoContext/Text/cairo_show_text.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_show_text() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_show_text($context, 'foobar');
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_show_text();
-cairo_show_text($context);
-cairo_show_text($context, 'foobar', 1);
-
-// check arg types, should be context object, string
-cairo_show_text(array(), 'foobar');
-cairo_show_text($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_show_text() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_show_text() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_show_text() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_show_text() must be an instance of CairoContext, array given
-
-Warning: cairo_show_text() expects parameter 1 to be CairoContext, array given in %s on line %d
-
-Warning: cairo_show_text() expects parameter 2 to be string, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/cairo_text_extents.phpt b/tests/CairoContext/Text/cairo_text_extents.phpt
deleted file mode 100644
index 534b54ef..00000000
--- a/tests/CairoContext/Text/cairo_text_extents.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-cairo_text_extents() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_text_extents($context, 'foobar'));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_text_extents();
-cairo_text_extents($context);
-cairo_text_extents($context, 'foobar', 1);
-
-// check arg types, should be context object, string
-cairo_text_extents(array(), 'foobar');
-cairo_text_extents($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(6) {
-  ["x_bearing"]=>
-  float(%f)
-  ["y_bearing"]=>
-  float(%f)
-  ["width"]=>
-  float(%f)
-  ["height"]=>
-  float(%f)
-  ["x_advance"]=>
-  float(%f)
-  ["y_advance"]=>
-  float(%f)
-}
-
-Warning: cairo_text_extents() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_text_extents() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_text_extents() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_text_extents() must be an instance of CairoContext, array given
-
-Warning: cairo_text_extents() expects parameter 1 to be CairoContext, array given in %s on line %d
-
-Warning: cairo_text_extents() expects parameter 2 to be string, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Text/create_toyfont.inc b/tests/CairoContext/Text/create_toyfont.inc
index 6b69ca29..1eeadb90 100644
--- a/tests/CairoContext/Text/create_toyfont.inc
+++ b/tests/CairoContext/Text/create_toyfont.inc
@@ -2,7 +2,7 @@
 if(function_exists('cairo_toy_font_face_create')) {
     $fontface = new CairoToyFontFace('sans-serif');
 } else {
-    //$surface = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+    //$surface = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
     //$context = new CairoContext($surface);
     //$context->selectFontFace('sans-serif');
     //$fontface = $context->getFontFace();
diff --git a/tests/CairoContext/Text/fontExtents.phpt b/tests/CairoContext/Text/fontExtents.phpt
index a8d35299..c24bd46b 100644
--- a/tests/CairoContext/Text/fontExtents.phpt
+++ b/tests/CairoContext/Text/fontExtents.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->fontExtents() method
+Cairo\Context->fontExtents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->fontExtents());
@@ -18,14 +18,14 @@ var_dump($context->fontExtents());
 try {
     $context->fontExtents('foo');
     trigger_error('fontExtents requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(5) {
   ["ascent"]=>
@@ -39,4 +39,4 @@ array(5) {
   ["max_y_advance"]=>
   float(%f)
 }
-CairoContext::fontExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::fontExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/getFontFace.phpt b/tests/CairoContext/Text/getFontFace.phpt
index a9e77c39..b8ad4c49 100644
--- a/tests/CairoContext/Text/getFontFace.phpt
+++ b/tests/CairoContext/Text/getFontFace.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getFontFace() method
+Cairo\Context->getFontFace() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($orig_face = $context->getFontFace());
@@ -25,23 +25,23 @@ var_dump($orig_face === $face1);
 try {
     $context->getFontFace('foo');
     trigger_error('getFontFace requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
 bool(true)
 bool(false)
-CairoContext::getFontFace() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getFontFace() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/getFontMatrix.phpt b/tests/CairoContext/Text/getFontMatrix.phpt
index 7549b0fc..af51214e 100644
--- a/tests/CairoContext/Text/getFontMatrix.phpt
+++ b/tests/CairoContext/Text/getFontMatrix.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->getFontMatrix() method
+Cairo\Context->getFontMatrix() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($orig_matrix = $context->getFontMatrix());
 
-$matrix = new CairoMatrix(5, 5);
+$matrix = new Cairo\Matrix(5, 5);
 var_dump($matrix);
 var_dump($orig_matrix === $matrix);
 
@@ -26,24 +26,24 @@ var_dump($orig_matrix === $matrix);
 try {
     $context->getFontMatrix('foo');
     trigger_error('get matrix requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
 bool(false)
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
 bool(true)
 bool(false)
-CairoContext::getFontMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getFontMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/getFontOptions.phpt b/tests/CairoContext/Text/getFontOptions.phpt
index 8488c5dc..284e78ed 100644
--- a/tests/CairoContext/Text/getFontOptions.phpt
+++ b/tests/CairoContext/Text/getFontOptions.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->getFontOptions() method
+Cairo\Context->getFontOptions() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($orig_options = $context->getFontOptions());
 
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($orig_options === $options);
 
 $context->setFontOptions($options);
@@ -25,22 +25,22 @@ var_dump($orig_options === $options1);
 try {
     $context->getFontOptions('foo');
     trigger_error('getFontOptions requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
 bool(false)
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
 bool(true)
 bool(false)
-CairoContext::getFontOptions() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getFontOptions() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/getScaledFont.phpt b/tests/CairoContext/Text/getScaledFont.phpt
index c65328fa..1fc7ca34 100644
--- a/tests/CairoContext/Text/getScaledFont.phpt
+++ b/tests/CairoContext/Text/getScaledFont.phpt
@@ -1,26 +1,26 @@
 --TEST--
-CairoContext->setScaledFont() method
+Cairo\Context->setScaledFont() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getScaledFont());
 
 /* create scaled font with new font face, font options, matrix */
 include(dirname(__FILE__) . '/create_toyfont.inc');
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 
 $context->setScaledFont($scaled);
 var_dump($context->getScaledFont());
@@ -28,19 +28,19 @@ var_dump($context->getScaledFont());
 try {
     $context->getScaledFont('foo');
     trigger_error('getScaledFont requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-CairoContext::getScaledFont() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getScaledFont() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/selectFontFace.phpt b/tests/CairoContext/Text/selectFontFace.phpt
index 70ce310f..7586b6b9 100644
--- a/tests/CairoContext/Text/selectFontFace.phpt
+++ b/tests/CairoContext/Text/selectFontFace.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->selectFontFace() method
+Cairo\Context->selectFontFace() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->selectFontFace('sans-serif');
@@ -20,15 +20,15 @@ var_dump($fontface);
 try {
     $context->selectFontFace();
     trigger_error('selectFontFace requires at least one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - too many */
 try {
-    $context->selectFontFace('sans-serif', CairoFontSlant::NORMAL, CairoFontWeight::NORMAL, 1);
+    $context->selectFontFace('sans-serif', Cairo\FontSlant::NORMAL, Cairo\FontWeight::NORMAL, 1);
     trigger_error('selectFontFace requires at least one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -36,7 +36,7 @@ try {
 try {
     $context->selectFontFace(array());
     trigger_error('selectFontFace requires a string font name');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -44,27 +44,27 @@ try {
 try {
     $context->selectFontFace('sans-serif', array());
     trigger_error('selectFontFace requires an int font slant');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type - int */
 try {
-    $context->selectFontFace('sans-serif', CairoFontSlant::NORMAL, array());
+    $context->selectFontFace('sans-serif', Cairo\FontSlant::NORMAL, array());
     trigger_error('selectFontFace requires an int font weight');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-CairoContext::selectFontFace() expects at least 1 parameter, 0 given
-CairoContext::selectFontFace() expects at most 3 parameters, 4 given
-CairoContext::selectFontFace() expects parameter 1 to be string, array given
-CairoContext::selectFontFace() expects parameter 2 to be long, array given
-CairoContext::selectFontFace() expects parameter 3 to be long, array given
\ No newline at end of file
+Cairo\Context::selectFontFace() expects at least 1 parameter, 0 given
+Cairo\Context::selectFontFace() expects at most 3 parameters, 4 given
+Cairo\Context::selectFontFace() expects parameter 1 to be string, array given
+Cairo\Context::selectFontFace() expects parameter 2 to be int, array given
+Cairo\Context::selectFontFace() expects parameter 3 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/setFontFace.phpt b/tests/CairoContext/Text/setFontFace.phpt
index 15bd4378..166cd40d 100644
--- a/tests/CairoContext/Text/setFontFace.phpt
+++ b/tests/CairoContext/Text/setFontFace.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->setFontFace() method
+Cairo\Context->setFontFace() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 include(dirname(__FILE__) . '/create_toyfont.inc');
@@ -31,37 +31,37 @@ var_dump($fontface1 === $fontface);
 try {
     $context->setFontFace();
     trigger_error('setFontFace requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setFontFace(1, 1);
     trigger_error('setFontFace requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setFontFace(1);
-    trigger_error('setFontFace requires instanceof CairoFontFace');
-} catch (CairoException $e) {
+    trigger_error('setFontFace requires instanceof Cairo\FontFace');
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
 bool(true)
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
 bool(true)
-CairoContext::setFontFace() expects exactly 1 parameter, 0 given
-CairoContext::setFontFace() expects exactly 1 parameter, 2 given
-CairoContext::setFontFace() expects parameter 1 to be CairoFontFace, integer given
\ No newline at end of file
+Cairo\Context::setFontFace() expects exactly 1 parameter, 0 given
+Cairo\Context::setFontFace() expects exactly 1 parameter, 2 given
+Cairo\Context::setFontFace() expects parameter 1 to be Cairo\FontFace, int given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/setFontMatrix.phpt b/tests/CairoContext/Text/setFontMatrix.phpt
index 9ee930ed..6ff093f8 100644
--- a/tests/CairoContext/Text/setFontMatrix.phpt
+++ b/tests/CairoContext/Text/setFontMatrix.phpt
@@ -1,18 +1,18 @@
 --TEST--
-CairoContext->setFontMatrix() method
+Cairo\Context->setFontMatrix() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$matrix = new CairoMatrix();
+$matrix = new Cairo\Matrix();
 var_dump($matrix);
 
 $context->setFontMatrix($matrix);
@@ -20,7 +20,7 @@ $matrix1 = $context->getFontMatrix();
 
 var_dump($matrix === $matrix1);
 
-$matrix2 = new CairoMatrix(5, 5);
+$matrix2 = new Cairo\Matrix(5, 5);
 $context->setFontMatrix($matrix2);
 $matrix1 = $context->getFontMatrix();
 
@@ -29,35 +29,35 @@ var_dump($matrix2 === $matrix1);
 try {
     $context->setFontMatrix();
     trigger_error('Set matrix requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setFontMatrix(1, 1);
     trigger_error('Set matrix requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setFontMatrix(1);
     trigger_error('Set matrix requires instanceof Cairomatrix');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
 bool(true)
 bool(true)
-CairoContext::setFontMatrix() expects exactly 1 parameter, 0 given
-CairoContext::setFontMatrix() expects exactly 1 parameter, 2 given
-CairoContext::setFontMatrix() expects parameter 1 to be CairoMatrix, integer given
\ No newline at end of file
+Cairo\Context::setFontMatrix() expects exactly 1 parameter, 0 given
+Cairo\Context::setFontMatrix() expects exactly 1 parameter, 2 given
+Cairo\Context::setFontMatrix() expects parameter 1 to be Cairo\Matrix, int given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/setFontOptions.phpt b/tests/CairoContext/Text/setFontOptions.phpt
index 12cb1c95..9ae77f51 100644
--- a/tests/CairoContext/Text/setFontOptions.phpt
+++ b/tests/CairoContext/Text/setFontOptions.phpt
@@ -1,18 +1,18 @@
 --TEST--
-CairoContext->setFontOptions() method
+Cairo\Context->setFontOptions() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 $context->setFontOptions($options);
@@ -20,7 +20,7 @@ $options1 = $context->getFontOptions();
 
 var_dump($options === $options1);
 
-$options2 = new CairoFontOptions();
+$options2 = new Cairo\FontOptions();
 $context->setFontOptions($options2);
 $options1 = $context->getFontOptions();
 
@@ -29,35 +29,35 @@ var_dump($options2 === $options1);
 try {
     $context->setFontOptions();
     trigger_error('setFontOptions requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setFontOptions(1, 1);
     trigger_error('setFontOptions requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setFontOptions(1);
-    trigger_error('setFontOptions requires instanceof CairoFontOptions');
-} catch (CairoException $e) {
+    trigger_error('setFontOptions requires instanceof Cairo\FontOptions');
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
 bool(true)
 bool(true)
-CairoContext::setFontOptions() expects exactly 1 parameter, 0 given
-CairoContext::setFontOptions() expects exactly 1 parameter, 2 given
-CairoContext::setFontOptions() expects parameter 1 to be CairoFontOptions, integer given
\ No newline at end of file
+Cairo\Context::setFontOptions() expects exactly 1 parameter, 0 given
+Cairo\Context::setFontOptions() expects exactly 1 parameter, 2 given
+Cairo\Context::setFontOptions() expects parameter 1 to be Cairo\FontOptions, int given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/setFontSize.phpt b/tests/CairoContext/Text/setFontSize.phpt
index 1fb80c56..a9fc4f5b 100644
--- a/tests/CairoContext/Text/setFontSize.phpt
+++ b/tests/CairoContext/Text/setFontSize.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->setFontSize() method
+Cairo\Context->setFontSize() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setFontSize(15);
 
-$context->setFontMatrix(new CairoMatrix(5, 5));
+$context->setFontMatrix(new Cairo\Matrix(5, 5));
 
 $context->setFontSize(10);
 
@@ -22,7 +22,7 @@ $context->setFontSize(10);
 try {
     $context->setFontSize();
     trigger_error('setFontSize requires at least one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -30,7 +30,7 @@ try {
 try {
     $context->setFontSize(15, 1);
     trigger_error('setFontSize requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -38,17 +38,17 @@ try {
 try {
     $context->setFontSize(array());
     trigger_error('setFontSize requires a double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // bogus memleak report - GC bug - is getting REALLY annoying
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::setFontSize() expects exactly 1 parameter, 0 given
-CairoContext::setFontSize() expects exactly 1 parameter, 2 given
-CairoContext::setFontSize() expects parameter 1 to be double, array given
+Cairo\Context::setFontSize() expects exactly 1 parameter, 0 given
+Cairo\Context::setFontSize() expects exactly 1 parameter, 2 given
+Cairo\Context::setFontSize() expects parameter 1 to be float, array given
diff --git a/tests/CairoContext/Text/setScaledFont.phpt b/tests/CairoContext/Text/setScaledFont.phpt
index 45fba7bc..705f0d5b 100644
--- a/tests/CairoContext/Text/setScaledFont.phpt
+++ b/tests/CairoContext/Text/setScaledFont.phpt
@@ -1,21 +1,21 @@
 --TEST--
-CairoContext->setScaledFont() method
+Cairo\Context->setScaledFont() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 /* set font face, font options, matrix */
-$orig_matrix = new CairoMatrix();
+$orig_matrix = new Cairo\Matrix();
 $context->setFontMatrix($orig_matrix);
-$orig_options = new CairoFontOptions();
+$orig_options = new Cairo\FontOptions();
 $context->setFontOptions($orig_options);
 include(dirname(__FILE__) . '/create_toyfont.inc');
 $orig_fontface = $fontface;
@@ -23,11 +23,11 @@ $context->setFontFace($orig_fontface);
 
 /* create scaled font with new font face, font options, matrix */
 include(dirname(__FILE__) . '/create_toyfont.inc');
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 $context->setScaledFont($scaled);
@@ -45,43 +45,43 @@ var_dump($scaled === $context->getScaledFont());
 
 /* create scaled font with new font face, font options, matrix */
 include(dirname(__FILE__) . '/create_toyfont.inc');
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 
 $context->setScaledFont($scaled);
 
 try {
     $context->setScaledFont();
     trigger_error('setScaledFont requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setScaledFont(1, 1);
     trigger_error('setScaledFont requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setScaledFont(1);
-    trigger_error('setScaledFont requires instanceof CairoScaledFont');
-} catch (CairoException $e) {
+    trigger_error('setScaledFont requires instanceof Cairo\ScaledFont');
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
 bool(false)
 bool(false)
@@ -90,6 +90,6 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-CairoContext::setScaledFont() expects exactly 1 parameter, 0 given
-CairoContext::setScaledFont() expects exactly 1 parameter, 2 given
-CairoContext::setScaledFont() expects parameter 1 to be CairoScaledFont, integer given
\ No newline at end of file
+Cairo\Context::setScaledFont() expects exactly 1 parameter, 0 given
+Cairo\Context::setScaledFont() expects exactly 1 parameter, 2 given
+Cairo\Context::setScaledFont() expects parameter 1 to be Cairo\ScaledFont, int given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/showText.phpt b/tests/CairoContext/Text/showText.phpt
index c07b8995..c654602f 100644
--- a/tests/CairoContext/Text/showText.phpt
+++ b/tests/CairoContext/Text/showText.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->showText() method
+Cairo\Context->showText() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->showText('foobar');
@@ -18,7 +18,7 @@ $context->showText('foobar');
 try {
     $context->showText();
     trigger_error('showText requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->showText('foo', 1);
     trigger_error('showText requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,15 +34,15 @@ try {
 try {
     $context->showText(array());
     trigger_error('showText requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::showText() expects exactly 1 parameter, 0 given
-CairoContext::showText() expects exactly 1 parameter, 2 given
-CairoContext::showText() expects parameter 1 to be string, array given
\ No newline at end of file
+Cairo\Context::showText() expects exactly 1 parameter, 0 given
+Cairo\Context::showText() expects exactly 1 parameter, 2 given
+Cairo\Context::showText() expects parameter 1 to be string, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Text/textExtents.phpt b/tests/CairoContext/Text/textExtents.phpt
index d80defd3..44d50852 100644
--- a/tests/CairoContext/Text/textExtents.phpt
+++ b/tests/CairoContext/Text/textExtents.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->textExtents() method
+Cairo\Context->textExtents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->textExtents('foobar'));
@@ -18,7 +18,7 @@ var_dump($context->textExtents('foobar'));
 try {
     $context->textExtents();
     trigger_error('textExtents requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->textExtents('foo', 1);
     trigger_error('textExtents requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,14 +34,14 @@ try {
 try {
     $context->textExtents(array());
     trigger_error('textExtents requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(6) {
   ["x_bearing"]=>
@@ -57,6 +57,6 @@ array(6) {
   ["y_advance"]=>
   float(%f)
 }
-CairoContext::textExtents() expects exactly 1 parameter, 0 given
-CairoContext::textExtents() expects exactly 1 parameter, 2 given
-CairoContext::textExtents() expects parameter 1 to be string, array given
\ No newline at end of file
+Cairo\Context::textExtents() expects exactly 1 parameter, 0 given
+Cairo\Context::textExtents() expects exactly 1 parameter, 2 given
+Cairo\Context::textExtents() expects parameter 1 to be string, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_device_to_user.phpt b/tests/CairoContext/Transformations/cairo_device_to_user.phpt
deleted file mode 100644
index e2ba533a..00000000
--- a/tests/CairoContext/Transformations/cairo_device_to_user.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-cairo_device_to_user function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_device_to_user($context, 5, 5));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_device_to_user();
-cairo_device_to_user($context);
-cairo_device_to_user($context, 1);
-cairo_device_to_user($context, 1, 1, 1);
-
-// check arg types, should be context object, double double
-cairo_device_to_user(1, 1, 1);
-cairo_device_to_user($context, array(), 1);
-cairo_device_to_user($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(5)
-  [1]=>
-  float(5)
-}
-
-Warning: cairo_device_to_user() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_device_to_user() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_device_to_user() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_device_to_user() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_device_to_user() must be an instance of CairoContext, integer given
-
-Warning: cairo_device_to_user() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_device_to_user() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_device_to_user() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_device_to_user_distance.phpt b/tests/CairoContext/Transformations/cairo_device_to_user_distance.phpt
deleted file mode 100644
index a268a948..00000000
--- a/tests/CairoContext/Transformations/cairo_device_to_user_distance.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-cairo_device_to_user_distance function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_device_to_user_distance($context, 5, 5));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_device_to_user_distance();
-cairo_device_to_user_distance($context);
-cairo_device_to_user_distance($context, 1);
-cairo_device_to_user_distance($context, 1, 1, 1);
-
-// check arg types, should be context object, double double
-cairo_device_to_user_distance(1, 1, 1);
-cairo_device_to_user_distance($context, array(), 1);
-cairo_device_to_user_distance($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(5)
-  [1]=>
-  float(5)
-}
-
-Warning: cairo_device_to_user_distance() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_device_to_user_distance() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_device_to_user_distance() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_device_to_user_distance() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_device_to_user_distance() must be an instance of CairoContext, integer given
-
-Warning: cairo_device_to_user_distance() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_device_to_user_distance() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_device_to_user_distance() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_get_matrix.phpt b/tests/CairoContext/Transformations/cairo_get_matrix.phpt
deleted file mode 100644
index 89b634a1..00000000
--- a/tests/CairoContext/Transformations/cairo_get_matrix.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-cairo_get_matrix() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump($orig_matrix = cairo_get_matrix($context));
-
-$matrix = cairo_matrix_init(5, 5);
-var_dump($matrix);
-var_dump($orig_matrix === $matrix);
-
-cairo_set_matrix($context, $matrix);
-var_dump($matrix1 = cairo_get_matrix($context));
-var_dump($matrix1 === $matrix);
-var_dump($orig_matrix === $matrix);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// requires exactly 1 arg
-cairo_get_matrix();
-cairo_get_matrix($context, 1);
-
-// arg types is CairoContext
-cairo_get_matrix(1);
-
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-bool(false)
-object(CairoMatrix)#%d (0) {
-}
-bool(true)
-bool(false)
-
-Warning: cairo_get_matrix() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_matrix() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_matrix() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_matrix() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_identity_matrix.phpt b/tests/CairoContext/Transformations/cairo_identity_matrix.phpt
deleted file mode 100644
index 8a11a347..00000000
--- a/tests/CairoContext/Transformations/cairo_identity_matrix.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_identity_matrix() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_identity_matrix($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_identity_matrix();
-cairo_identity_matrix($context, 1);
-
-// check arg types, should be context object
-cairo_identity_matrix(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_identity_matrix() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_identity_matrix() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_identity_matrix() must be an instance of CairoContext, integer given
-
-Warning: cairo_identity_matrix() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_rotate.phpt b/tests/CairoContext/Transformations/cairo_rotate.phpt
deleted file mode 100644
index 83a1be0d..00000000
--- a/tests/CairoContext/Transformations/cairo_rotate.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_rotate() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_rotate($context, 5);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_rotate();
-cairo_rotate($context);
-cairo_rotate($context, 1, 1);
-
-// check arg types, should be context object, double
-cairo_rotate(1, 1);
-cairo_rotate($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_rotate() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_rotate() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_rotate() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_rotate() must be an instance of CairoContext, integer given
-
-Warning: cairo_rotate() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_rotate() expects parameter 2 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_scale.phpt b/tests/CairoContext/Transformations/cairo_scale.phpt
deleted file mode 100644
index 9fda3f73..00000000
--- a/tests/CairoContext/Transformations/cairo_scale.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_scale() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_scale($context, 5, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_scale();
-cairo_scale($context);
-cairo_scale($context, 1);
-cairo_scale($context, 1, 1, 1);
-
-// check arg types, should be context object, double double
-cairo_scale(1, 1, 1);
-cairo_scale($context, array(), 1);
-cairo_scale($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_scale() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_scale() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_scale() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_scale() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scale() must be an instance of CairoContext, integer given
-
-Warning: cairo_scale() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_scale() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_scale() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_set_matrix.phpt b/tests/CairoContext/Transformations/cairo_set_matrix.phpt
deleted file mode 100644
index 30abc0dc..00000000
--- a/tests/CairoContext/Transformations/cairo_set_matrix.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-cairo_set_matrix() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$matrix = cairo_matrix_init();
-var_dump($matrix);
-
-cairo_set_matrix($context, $matrix);
-$matrix1 = cairo_get_matrix($context);
-var_dump($matrix === $matrix1);
-
-$matrix2 = cairo_matrix_init(5, 5);
-cairo_set_matrix($context, $matrix2);
-$matrix1 = cairo_get_matrix($context);
-var_dump($matrix2 === $matrix1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// requires exactly 2 args
-cairo_set_matrix();
-cairo_set_matrix($context);
-cairo_set_matrix($context, $matrix, 1);
-
-// arg types are CairoContext and CairoMatrix
-cairo_set_matrix(1, $matrix);
-cairo_set_matrix($context, 1);
-
-die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-bool(true)
-bool(true)
-
-Warning: cairo_set_matrix() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_matrix() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_matrix() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_matrix() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_matrix() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_matrix() must be an instance of CairoMatrix, integer given
-
-Warning: cairo_set_matrix() expects parameter 2 to be CairoMatrix, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_transform.phpt b/tests/CairoContext/Transformations/cairo_transform.phpt
deleted file mode 100644
index ca28407f..00000000
--- a/tests/CairoContext/Transformations/cairo_transform.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_transform() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$matrix = cairo_matrix_init(1, 0, 0, 1);
-var_dump($matrix);
-
-cairo_transform($context, $matrix);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_transform();
-cairo_transform($context);
-cairo_transform($context, $matrix, 1);
-
-// check arg types, should be context object, matrix object
-cairo_transform(1, $matrix);
-cairo_transform($context, 1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-
-Warning: cairo_transform() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_transform() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_transform() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_transform() must be an instance of CairoContext, integer given
-
-Warning: cairo_transform() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_transform() must be an instance of CairoMatrix, integer given
-
-Warning: cairo_transform() expects parameter 2 to be CairoMatrix, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_translate.phpt b/tests/CairoContext/Transformations/cairo_translate.phpt
deleted file mode 100644
index 3928a3d3..00000000
--- a/tests/CairoContext/Transformations/cairo_translate.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_translate() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_translate($context, 5, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_translate();
-cairo_translate($context);
-cairo_translate($context, 1);
-cairo_translate($context, 1, 1, 1);
-
-// check arg types, should be context object, double double
-cairo_translate(1, 1, 1);
-cairo_translate($context, array(), 1);
-cairo_translate($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_translate() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_translate() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_translate() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_translate() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_translate() must be an instance of CairoContext, integer given
-
-Warning: cairo_translate() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_translate() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_translate() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_user_to_device.phpt b/tests/CairoContext/Transformations/cairo_user_to_device.phpt
deleted file mode 100644
index 80331913..00000000
--- a/tests/CairoContext/Transformations/cairo_user_to_device.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-cairo_user_to_device function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_user_to_device($context, 5, 5));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_user_to_device();
-cairo_user_to_device($context);
-cairo_user_to_device($context, 1);
-cairo_user_to_device($context, 1, 1, 1);
-
-// check arg types, should be context object, double double
-cairo_user_to_device(1, 1, 1);
-cairo_user_to_device($context, array(), 1);
-cairo_user_to_device($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(5)
-  [1]=>
-  float(5)
-}
-
-Warning: cairo_user_to_device() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_user_to_device() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_user_to_device() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_user_to_device() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_user_to_device() must be an instance of CairoContext, integer given
-
-Warning: cairo_user_to_device() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_user_to_device() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_user_to_device() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/cairo_user_to_device_distance.phpt b/tests/CairoContext/Transformations/cairo_user_to_device_distance.phpt
deleted file mode 100644
index 1f545bda..00000000
--- a/tests/CairoContext/Transformations/cairo_user_to_device_distance.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-cairo_user_to_device_distance function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_user_to_device_distance($context, 5, 5));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_user_to_device_distance();
-cairo_user_to_device_distance($context);
-cairo_user_to_device_distance($context, 1);
-cairo_user_to_device_distance($context, 1, 1, 1);
-
-// check arg types, should be context object, double double
-cairo_user_to_device_distance(1, 1, 1);
-cairo_user_to_device_distance($context, array(), 1);
-cairo_user_to_device_distance($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(5)
-  [1]=>
-  float(5)
-}
-
-Warning: cairo_user_to_device_distance() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_user_to_device_distance() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_user_to_device_distance() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_user_to_device_distance() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_user_to_device_distance() must be an instance of CairoContext, integer given
-
-Warning: cairo_user_to_device_distance() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_user_to_device_distance() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_user_to_device_distance() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/deviceToUser.phpt b/tests/CairoContext/Transformations/deviceToUser.phpt
index e1eae108..0443532c 100644
--- a/tests/CairoContext/Transformations/deviceToUser.phpt
+++ b/tests/CairoContext/Transformations/deviceToUser.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->deviceToUser() method
+Cairo\Context->deviceToUser() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->deviceToUser(5, 5));
@@ -18,7 +18,7 @@ var_dump($context->deviceToUser(5, 5));
 try {
     $context->deviceToUser();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->deviceToUser(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->deviceToUser(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->deviceToUser(array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,14 +50,14 @@ try {
 try {
     $context->deviceToUser(10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -65,8 +65,8 @@ array(2) {
   [1]=>
   float(5)
 }
-CairoContext::deviceToUser() expects exactly 2 parameters, 0 given
-CairoContext::deviceToUser() expects exactly 2 parameters, 1 given
-CairoContext::deviceToUser() expects exactly 2 parameters, 3 given
-CairoContext::deviceToUser() expects parameter 1 to be double, array given
-CairoContext::deviceToUser() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::deviceToUser() expects exactly 2 parameters, 0 given
+Cairo\Context::deviceToUser() expects exactly 2 parameters, 1 given
+Cairo\Context::deviceToUser() expects exactly 2 parameters, 3 given
+Cairo\Context::deviceToUser() expects parameter 1 to be float, array given
+Cairo\Context::deviceToUser() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/deviceToUserDistance.phpt b/tests/CairoContext/Transformations/deviceToUserDistance.phpt
index 85e870f7..3a6bc467 100644
--- a/tests/CairoContext/Transformations/deviceToUserDistance.phpt
+++ b/tests/CairoContext/Transformations/deviceToUserDistance.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->deviceToUserDistance() method
+Cairo\Context->deviceToUserDistance() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->deviceToUserDistance(5, 5));
@@ -18,7 +18,7 @@ var_dump($context->deviceToUserDistance(5, 5));
 try {
     $context->deviceToUserDistance();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->deviceToUserDistance(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->deviceToUserDistance(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->deviceToUserDistance(array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,14 +50,14 @@ try {
 try {
     $context->deviceToUserDistance(10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -65,8 +65,8 @@ array(2) {
   [1]=>
   float(5)
 }
-CairoContext::deviceToUserDistance() expects exactly 2 parameters, 0 given
-CairoContext::deviceToUserDistance() expects exactly 2 parameters, 1 given
-CairoContext::deviceToUserDistance() expects exactly 2 parameters, 3 given
-CairoContext::deviceToUserDistance() expects parameter 1 to be double, array given
-CairoContext::deviceToUserDistance() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::deviceToUserDistance() expects exactly 2 parameters, 0 given
+Cairo\Context::deviceToUserDistance() expects exactly 2 parameters, 1 given
+Cairo\Context::deviceToUserDistance() expects exactly 2 parameters, 3 given
+Cairo\Context::deviceToUserDistance() expects parameter 1 to be float, array given
+Cairo\Context::deviceToUserDistance() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/getMatrix.phpt b/tests/CairoContext/Transformations/getMatrix.phpt
index b0b882e7..4263ddd2 100644
--- a/tests/CairoContext/Transformations/getMatrix.phpt
+++ b/tests/CairoContext/Transformations/getMatrix.phpt
@@ -1,20 +1,20 @@
 --TEST--
-CairoContext->getMatrix() method
+Cairo\Context->getMatrix() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($orig_matrix = $context->getMatrix());
 
-$matrix = new CairoMatrix(5, 5);
+$matrix = new Cairo\Matrix(5, 5);
 var_dump($matrix);
 var_dump($orig_matrix === $matrix);
 
@@ -26,24 +26,24 @@ var_dump($orig_matrix === $matrix);
 try {
     $context->getMatrix('foo');
     trigger_error('get matrix requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
 bool(false)
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
 bool(true)
 bool(false)
-CairoContext::getMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/identityMatrix.phpt b/tests/CairoContext/Transformations/identityMatrix.phpt
index 08b89aad..62211e59 100644
--- a/tests/CairoContext/Transformations/identityMatrix.phpt
+++ b/tests/CairoContext/Transformations/identityMatrix.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->identityMatrix() method
+Cairo\Context->identityMatrix() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->identityMatrix();
@@ -18,13 +18,13 @@ $context->identityMatrix();
 try {
     $context->identityMatrix('foo');
     trigger_error('identityMatrix requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::identityMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::identityMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/rotate.phpt b/tests/CairoContext/Transformations/rotate.phpt
index 13d897f2..689f3de5 100644
--- a/tests/CairoContext/Transformations/rotate.phpt
+++ b/tests/CairoContext/Transformations/rotate.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->rotate() method
+Cairo\Context->rotate() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->rotate(5);
@@ -18,7 +18,7 @@ $context->rotate(5);
 try {
     $context->rotate();
     trigger_error('rotate requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->rotate(1,1);
     trigger_error('rotate requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,15 +34,15 @@ try {
 try {
     $context->rotate(array());
     trigger_error('rotate requires double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::rotate() expects exactly 1 parameter, 0 given
-CairoContext::rotate() expects exactly 1 parameter, 2 given
-CairoContext::rotate() expects parameter 1 to be double, array given
\ No newline at end of file
+Cairo\Context::rotate() expects exactly 1 parameter, 0 given
+Cairo\Context::rotate() expects exactly 1 parameter, 2 given
+Cairo\Context::rotate() expects parameter 1 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/scale.phpt b/tests/CairoContext/Transformations/scale.phpt
index c7645839..6289bec0 100644
--- a/tests/CairoContext/Transformations/scale.phpt
+++ b/tests/CairoContext/Transformations/scale.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->scale() method
+Cairo\Context->scale() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->scale(5, 5);
@@ -18,7 +18,7 @@ $context->scale(5, 5);
 try {
     $context->scale();
     trigger_error('scale requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->scale(1);
     trigger_error('scale requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->scale(1,1,1);
     trigger_error('scale requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->scale(array(), 1);
     trigger_error('scale requires double, double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,17 +50,17 @@ try {
 try {
     $context->scale(1, array());
     trigger_error('scale requires double, double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::scale() expects exactly 2 parameters, 0 given
-CairoContext::scale() expects exactly 2 parameters, 1 given
-CairoContext::scale() expects exactly 2 parameters, 3 given
-CairoContext::scale() expects parameter 1 to be double, array given
-CairoContext::scale() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::scale() expects exactly 2 parameters, 0 given
+Cairo\Context::scale() expects exactly 2 parameters, 1 given
+Cairo\Context::scale() expects exactly 2 parameters, 3 given
+Cairo\Context::scale() expects parameter 1 to be float, array given
+Cairo\Context::scale() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/setMatrix.phpt b/tests/CairoContext/Transformations/setMatrix.phpt
index 38c29f53..8a66ace3 100644
--- a/tests/CairoContext/Transformations/setMatrix.phpt
+++ b/tests/CairoContext/Transformations/setMatrix.phpt
@@ -1,18 +1,18 @@
 --TEST--
-CairoContext->setMatrix() method
+Cairo\Context->setMatrix() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$matrix = new CairoMatrix();
+$matrix = new Cairo\Matrix();
 var_dump($matrix);
 
 $context->setMatrix($matrix);
@@ -20,7 +20,7 @@ $matrix1 = $context->getMatrix();
 
 var_dump($matrix === $matrix1);
 
-$matrix2 = new CairoMatrix(5, 5);
+$matrix2 = new Cairo\Matrix(5, 5);
 $context->setMatrix($matrix2);
 $matrix1 = $context->getMatrix();
 
@@ -29,35 +29,35 @@ var_dump($matrix2 === $matrix1);
 try {
     $context->setMatrix();
     trigger_error('Set matrix requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setMatrix(1, 1);
     trigger_error('Set matrix requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setMatrix(1);
     trigger_error('Set matrix requires instanceof Cairomatrix');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // DO NOT REMOVE THIS - fixes issue in 5.3 with GC giving bogus memleak reports
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
 bool(true)
 bool(true)
-CairoContext::setMatrix() expects exactly 1 parameter, 0 given
-CairoContext::setMatrix() expects exactly 1 parameter, 2 given
-CairoContext::setMatrix() expects parameter 1 to be CairoMatrix, integer given
\ No newline at end of file
+Cairo\Context::setMatrix() expects exactly 1 parameter, 0 given
+Cairo\Context::setMatrix() expects exactly 1 parameter, 2 given
+Cairo\Context::setMatrix() expects parameter 1 to be Cairo\Matrix, int given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/transform.phpt b/tests/CairoContext/Transformations/transform.phpt
index cfcfd2d7..74aeff09 100644
--- a/tests/CairoContext/Transformations/transform.phpt
+++ b/tests/CairoContext/Transformations/transform.phpt
@@ -1,18 +1,18 @@
 --TEST--
-CairoContext->transform() method
+Cairo\Context->transform() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$matrix = new CairoMatrix(1, 0, 0, 1);
+$matrix = new Cairo\Matrix(1, 0, 0, 1);
 var_dump($matrix);
 
 $context->transform($matrix);
@@ -21,7 +21,7 @@ $context->transform($matrix);
 try {
     $context->transform();
     trigger_error('transform requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -29,7 +29,7 @@ try {
 try {
     $context->transform($matrix, 1);
     trigger_error('transform requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -37,17 +37,17 @@ try {
 try {
     $context->transform(1);
     trigger_error('transform requires cairomatrix object');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
-CairoContext::transform() expects exactly 1 parameter, 0 given
-CairoContext::transform() expects exactly 1 parameter, 2 given
-CairoContext::transform() expects parameter 1 to be CairoMatrix, integer given
\ No newline at end of file
+Cairo\Context::transform() expects exactly 1 parameter, 0 given
+Cairo\Context::transform() expects exactly 1 parameter, 2 given
+Cairo\Context::transform() expects parameter 1 to be Cairo\Matrix, int given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/translate.phpt b/tests/CairoContext/Transformations/translate.phpt
index 5e03d55d..8967ba97 100644
--- a/tests/CairoContext/Transformations/translate.phpt
+++ b/tests/CairoContext/Transformations/translate.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->translate() method
+Cairo\Context->translate() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->translate(5, 5);
@@ -18,7 +18,7 @@ $context->translate(5, 5);
 try {
     $context->translate();
     trigger_error('translate requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->translate(1);
     trigger_error('translate requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->translate(1,1,1);
     trigger_error('translate requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->translate(array(), 1);
     trigger_error('translate requires double, double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,17 +50,17 @@ try {
 try {
     $context->translate(1, array());
     trigger_error('translate requires double, double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::translate() expects exactly 2 parameters, 0 given
-CairoContext::translate() expects exactly 2 parameters, 1 given
-CairoContext::translate() expects exactly 2 parameters, 3 given
-CairoContext::translate() expects parameter 1 to be double, array given
-CairoContext::translate() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::translate() expects exactly 2 parameters, 0 given
+Cairo\Context::translate() expects exactly 2 parameters, 1 given
+Cairo\Context::translate() expects exactly 2 parameters, 3 given
+Cairo\Context::translate() expects parameter 1 to be float, array given
+Cairo\Context::translate() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/userToDevice.phpt b/tests/CairoContext/Transformations/userToDevice.phpt
index 973d0575..f992a87a 100644
--- a/tests/CairoContext/Transformations/userToDevice.phpt
+++ b/tests/CairoContext/Transformations/userToDevice.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->userToDevice() method
+Cairo\Context->userToDevice() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->userToDevice(5, 5));
@@ -18,7 +18,7 @@ var_dump($context->userToDevice(5, 5));
 try {
     $context->userToDevice();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->userToDevice(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->userToDevice(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->userToDevice(array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,14 +50,14 @@ try {
 try {
     $context->userToDevice(10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -65,8 +65,8 @@ array(2) {
   [1]=>
   float(5)
 }
-CairoContext::userToDevice() expects exactly 2 parameters, 0 given
-CairoContext::userToDevice() expects exactly 2 parameters, 1 given
-CairoContext::userToDevice() expects exactly 2 parameters, 3 given
-CairoContext::userToDevice() expects parameter 1 to be double, array given
-CairoContext::userToDevice() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::userToDevice() expects exactly 2 parameters, 0 given
+Cairo\Context::userToDevice() expects exactly 2 parameters, 1 given
+Cairo\Context::userToDevice() expects exactly 2 parameters, 3 given
+Cairo\Context::userToDevice() expects parameter 1 to be float, array given
+Cairo\Context::userToDevice() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/Transformations/userToDeviceDistance.phpt b/tests/CairoContext/Transformations/userToDeviceDistance.phpt
index 0f046bb3..ac2a6873 100644
--- a/tests/CairoContext/Transformations/userToDeviceDistance.phpt
+++ b/tests/CairoContext/Transformations/userToDeviceDistance.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->userToDeviceDistance() method
+Cairo\Context->userToDeviceDistance() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->userToDeviceDistance(5, 5));
@@ -18,7 +18,7 @@ var_dump($context->userToDeviceDistance(5, 5));
 try {
     $context->userToDeviceDistance();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->userToDeviceDistance(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->userToDeviceDistance(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->userToDeviceDistance(array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,14 +50,14 @@ try {
 try {
     $context->userToDeviceDistance(10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -65,8 +65,8 @@ array(2) {
   [1]=>
   float(5)
 }
-CairoContext::userToDeviceDistance() expects exactly 2 parameters, 0 given
-CairoContext::userToDeviceDistance() expects exactly 2 parameters, 1 given
-CairoContext::userToDeviceDistance() expects exactly 2 parameters, 3 given
-CairoContext::userToDeviceDistance() expects parameter 1 to be double, array given
-CairoContext::userToDeviceDistance() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::userToDeviceDistance() expects exactly 2 parameters, 0 given
+Cairo\Context::userToDeviceDistance() expects exactly 2 parameters, 1 given
+Cairo\Context::userToDeviceDistance() expects exactly 2 parameters, 3 given
+Cairo\Context::userToDeviceDistance() expects parameter 1 to be float, array given
+Cairo\Context::userToDeviceDistance() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/__construct.phpt b/tests/CairoContext/__construct.phpt
index e3f089aa..7ba6fa1b 100644
--- a/tests/CairoContext/__construct.phpt
+++ b/tests/CairoContext/__construct.phpt
@@ -1,46 +1,46 @@
 --TEST--
-new CairoContext [ __construct() method ]
+new Cairo\Context [ __construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 /* Wrong number args - 1 */
 try {
-    new CairoContext();
+    new Cairo\Context();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    new CairoContext($surface, 10);
+    new Cairo\Context($surface, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    new CairoContext(1);
+    new Cairo\Context(1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::__construct() expects exactly 1 parameter, 0 given
-CairoContext::__construct() expects exactly 1 parameter, 2 given
-CairoContext::__construct() expects parameter 1 to be CairoSurface, integer given
\ No newline at end of file
+Cairo\Context::__construct() expects exactly 1 parameter, 0 given
+Cairo\Context::__construct() expects exactly 1 parameter, 2 given
+Argument 1 passed to Cairo\Context::__construct() must be an instance of Cairo\Surface, int given
diff --git a/tests/CairoContext/cairo_clip.phpt b/tests/CairoContext/cairo_clip.phpt
deleted file mode 100644
index c838e6a4..00000000
--- a/tests/CairoContext/cairo_clip.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_clip function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_clip($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_clip();
-cairo_clip($context, 1);
-
-// check arg types, should be CairoContext
-cairo_clip(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_clip() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_clip() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_clip() must be an instance of CairoContext, integer given
-
-Warning: cairo_clip() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_clip_extents.phpt b/tests/CairoContext/cairo_clip_extents.phpt
deleted file mode 100644
index 6a78ad74..00000000
--- a/tests/CairoContext/cairo_clip_extents.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-cairo_clip_extents function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_clip_extents($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_clip_extents();
-cairo_clip_extents($context, 1);
-
-// check arg types, should be CairoContext
-cairo_clip_extents(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(4) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(0)
-  [2]=>
-  float(50)
-  [3]=>
-  float(50)
-}
-
-Warning: cairo_clip_extents() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_clip_extents() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_clip_extents() must be an instance of CairoContext, integer given
-
-Warning: cairo_clip_extents() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_clip_preserve.phpt b/tests/CairoContext/cairo_clip_preserve.phpt
deleted file mode 100644
index 9b31009a..00000000
--- a/tests/CairoContext/cairo_clip_preserve.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_clip_preserve function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_clip_preserve($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_clip_preserve();
-cairo_clip_preserve($context, 1);
-
-// check arg types, should be CairoContext
-cairo_clip_preserve(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_clip_preserve() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_clip_preserve() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_clip_preserve() must be an instance of CairoContext, integer given
-
-Warning: cairo_clip_preserve() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_clip_rectangle_list.phpt b/tests/CairoContext/cairo_clip_rectangle_list.phpt
deleted file mode 100644
index dd5e3af5..00000000
--- a/tests/CairoContext/cairo_clip_rectangle_list.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-cairo_clip_rectangle_list function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_clip_rectangle_list($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_clip_rectangle_list();
-cairo_clip_rectangle_list($context, 1);
-
-// check arg types, should be CairoContext
-cairo_clip_rectangle_list(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(1) {
-  [0]=>
-  array(4) {
-    ["x"]=>
-    float(0)
-    ["y"]=>
-    float(0)
-    ["width"]=>
-    float(50)
-    ["height"]=>
-    float(50)
-  }
-}
-
-Warning: cairo_clip_rectangle_list() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_clip_rectangle_list() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_clip_rectangle_list() must be an instance of CairoContext, integer given
-
-Warning: cairo_clip_rectangle_list() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_copy_page.phpt b/tests/CairoContext/cairo_copy_page.phpt
deleted file mode 100644
index 9cad8f9e..00000000
--- a/tests/CairoContext/cairo_copy_page.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_copy_page() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_copy_page($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_copy_page();
-cairo_copy_page($context, 1);
-
-/* wrong types */
-cairo_copy_page(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_copy_page() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_copy_page() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_copy_page() must be an instance of CairoContext, integer given
-
-Warning: cairo_copy_page() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_create.phpt b/tests/CairoContext/cairo_create.phpt
deleted file mode 100644
index 474ea6f3..00000000
--- a/tests/CairoContext/cairo_create.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-cairo_create function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_create();
-cairo_create($surface, 1);
-
-// check arg types, should be CairoSurface
-cairo_create(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_create() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_create() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_create() must be an instance of CairoSurface, integer given
-
-Warning: cairo_create() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_fill.phpt b/tests/CairoContext/cairo_fill.phpt
deleted file mode 100644
index 20a50ee3..00000000
--- a/tests/CairoContext/cairo_fill.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_fill function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_fill($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_fill();
-cairo_fill($context, 1);
-
-// check arg types, should be CairoContext
-cairo_fill(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_fill() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_fill() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_fill() must be an instance of CairoContext, integer given
-
-Warning: cairo_fill() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_fill_extents.phpt b/tests/CairoContext/cairo_fill_extents.phpt
deleted file mode 100644
index 3ff03496..00000000
--- a/tests/CairoContext/cairo_fill_extents.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-cairo_fill_extents function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_fill_extents($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_fill_extents();
-cairo_fill_extents($context, 1);
-
-// check arg types, should be CairoContext
-cairo_fill_extents(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(4) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(0)
-  [2]=>
-  float(0)
-  [3]=>
-  float(0)
-}
-
-Warning: cairo_fill_extents() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_fill_extents() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_fill_extents() must be an instance of CairoContext, integer given
-
-Warning: cairo_fill_extents() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_fill_preserve.phpt b/tests/CairoContext/cairo_fill_preserve.phpt
deleted file mode 100644
index 03887824..00000000
--- a/tests/CairoContext/cairo_fill_preserve.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_fill_preserve function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_fill_preserve($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_fill_preserve();
-cairo_fill_preserve($context, 1);
-
-// check arg types, should be CairoContext
-cairo_fill_preserve(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_fill_preserve() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_fill_preserve() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_fill_preserve() must be an instance of CairoContext, integer given
-
-Warning: cairo_fill_preserve() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_antialias.phpt b/tests/CairoContext/cairo_get_antialias.phpt
deleted file mode 100644
index fe4195f6..00000000
--- a/tests/CairoContext/cairo_get_antialias.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_antialias function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_antialias($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_antialias();
-cairo_get_antialias($context, 1);
-
-// check arg types, should be CairoSurface
-cairo_get_antialias(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(0)
-
-Warning: cairo_get_antialias() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_antialias() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_antialias() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_antialias() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_dash.phpt b/tests/CairoContext/cairo_get_dash.phpt
deleted file mode 100644
index 068391c4..00000000
--- a/tests/CairoContext/cairo_get_dash.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-cairo_get_dash function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_dash($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_get_dash();
-cairo_get_dash($context, 1);
-
-// check arg types, should be context object
-cairo_get_dash(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  ["dashes"]=>
-  array(0) {
-  }
-  ["offset"]=>
-  float(0)
-}
-
-Warning: cairo_get_dash() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_dash() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_dash() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_dash() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_dash_count.phpt b/tests/CairoContext/cairo_get_dash_count.phpt
deleted file mode 100644
index d972b8e1..00000000
--- a/tests/CairoContext/cairo_get_dash_count.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_dash_count function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_dash_count($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1
-cairo_get_dash_count();
-cairo_get_dash_count($context, 1);
-
-// check arg types, should be context object
-cairo_get_dash_count(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(0)
-
-Warning: cairo_get_dash_count() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_dash_count() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_dash_count() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_dash_count() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_fill_rule.phpt b/tests/CairoContext/cairo_get_fill_rule.phpt
deleted file mode 100644
index 70ac2e06..00000000
--- a/tests/CairoContext/cairo_get_fill_rule.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_fill_rule() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_fill_rule($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_fill_rule();
-cairo_get_fill_rule($context, 1);
-
-// check arg types, should be context object
-cairo_get_fill_rule(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(0)
-
-Warning: cairo_get_fill_rule() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_fill_rule() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_fill_rule() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_fill_rule() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_group_target.phpt b/tests/CairoContext/cairo_get_group_target.phpt
deleted file mode 100644
index c451d71a..00000000
--- a/tests/CairoContext/cairo_get_group_target.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_get_group_target function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$surface2 = cairo_get_group_target($context);
-var_dump($surface2);
-var_dump($surface2 == $surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong parameters */
-cairo_get_group_target();
-cairo_get_group_target($context, 1);
-
-/* wrong type */
-cairo_get_group_target(1);
-
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoImageSurface)#%d (0) {
-}
-bool(true)
-
-Warning: cairo_get_group_target() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_group_target() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_group_target() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_group_target() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_line_cap.phpt b/tests/CairoContext/cairo_get_line_cap.phpt
deleted file mode 100644
index b42d861b..00000000
--- a/tests/CairoContext/cairo_get_line_cap.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_line_cap() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_line_cap($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_line_cap();
-cairo_get_line_cap($context, 1);
-
-// check arg types, should be context object
-cairo_get_line_cap(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(0)
-
-Warning: cairo_get_line_cap() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_line_cap() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_line_cap() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_line_cap() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_line_join.phpt b/tests/CairoContext/cairo_get_line_join.phpt
deleted file mode 100644
index ce1a6ddb..00000000
--- a/tests/CairoContext/cairo_get_line_join.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_line_join() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_line_join($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_line_join();
-cairo_get_line_join($context, 1);
-
-// check arg types, should be context object
-cairo_get_line_join(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(0)
-
-Warning: cairo_get_line_join() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_line_join() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_line_join() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_line_join() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_line_width.phpt b/tests/CairoContext/cairo_get_line_width.phpt
deleted file mode 100644
index a40f1a53..00000000
--- a/tests/CairoContext/cairo_get_line_width.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_line_width() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_line_width($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_line_width();
-cairo_get_line_width($context, 1);
-
-// check arg types, should be context object
-cairo_get_line_width(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-float(2)
-
-Warning: cairo_get_line_width() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_line_width() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_line_width() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_line_width() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_miter_limit.phpt b/tests/CairoContext/cairo_get_miter_limit.phpt
deleted file mode 100644
index c95f2d82..00000000
--- a/tests/CairoContext/cairo_get_miter_limit.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_miter_limit() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_miter_limit($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_miter_limit();
-cairo_get_miter_limit($context, 1);
-
-// check arg types, should be context object
-cairo_get_miter_limit(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-float(10)
-
-Warning: cairo_get_miter_limit() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_miter_limit() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_miter_limit() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_miter_limit() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_operator.phpt b/tests/CairoContext/cairo_get_operator.phpt
deleted file mode 100644
index e7c1069b..00000000
--- a/tests/CairoContext/cairo_get_operator.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_operator() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_operator($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_operator();
-cairo_get_operator($context, 1);
-
-// check arg types, should be context object
-cairo_get_operator(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(2)
-
-Warning: cairo_get_operator() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_operator() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_operator() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_operator() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_source.phpt b/tests/CairoContext/cairo_get_source.phpt
deleted file mode 100644
index 5ebf3cae..00000000
--- a/tests/CairoContext/cairo_get_source.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_get_source function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$pattern = cairo_get_source($context);
-var_dump($pattern);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-            echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-$pattern = cairo_get_source(new stdClass);
-var_dump($pattern);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoSolidPattern)#%d (0) {
-}
-CAUGHT ERROR: Argument 1 passed to cairo_get_source() must be an instance of CairoContext, instance of stdClass given
-
-Warning: cairo_get_source() expects parameter 1 to be CairoContext, object given in %s on line %d
-NULL
diff --git a/tests/CairoContext/cairo_get_target.phpt b/tests/CairoContext/cairo_get_target.phpt
deleted file mode 100644
index 5f43ce23..00000000
--- a/tests/CairoContext/cairo_get_target.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-cairo_get_target function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$surface2 = cairo_get_target($context);
-var_dump($surface2);
-var_dump($surface2 == $surface);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoImageSurface)#%d (0) {
-}
-bool(true)
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_target_custom_class.phpt b/tests/CairoContext/cairo_get_target_custom_class.phpt
deleted file mode 100644
index 9f9e64f4..00000000
--- a/tests/CairoContext/cairo_get_target_custom_class.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-cairo_get_target() should return custom classes derived from CairoImageSurface
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-class TestSurface extends CairoImageSurface {
-    function __construct($format, $width, $height) {
-        parent::__construct($format, $width, $height);
-    }
-}
-
-$t = new TestSurface(CairoFormat::ARGB32, 500, 500);
-$c = cairo_create($t);
-var_dump(cairo_get_target($c) instanceof TestSurface);
-var_dump(cairo_get_target($c) instanceof TestSurface);
-unset($t);
-var_dump(cairo_get_target($c) instanceof TestSurface);
-die; // PHP bug? get a memleak without this
-?>
---EXPECTF--
-bool(true)
-bool(true)
-bool(true)
diff --git a/tests/CairoContext/cairo_get_target_errors.phpt b/tests/CairoContext/cairo_get_target_errors.phpt
deleted file mode 100644
index b408a920..00000000
--- a/tests/CairoContext/cairo_get_target_errors.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-cairo_get_target error conditions
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_get_target();
-cairo_get_target($context, 'foobar');
-cairo_get_target('foobar');
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_get_target() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_target() expects exactly 1 parameter, 2 given in %s on line %d
-
-Catchable fatal error: Argument 1 passed to cairo_get_target() must be an instance of CairoContext, string given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_get_tolerance.phpt b/tests/CairoContext/cairo_get_tolerance.phpt
deleted file mode 100644
index 1c242c05..00000000
--- a/tests/CairoContext/cairo_get_tolerance.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_get_tolerance() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_get_tolerance($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_get_tolerance();
-cairo_get_tolerance($context, 1);
-
-// check arg types, should be context object
-cairo_get_tolerance(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-float(0.1)
-
-Warning: cairo_get_tolerance() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_get_tolerance() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_get_tolerance() must be an instance of CairoContext, integer given
-
-Warning: cairo_get_tolerance() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_in_fill.phpt b/tests/CairoContext/cairo_in_fill.phpt
deleted file mode 100644
index 1cf2b722..00000000
--- a/tests/CairoContext/cairo_in_fill.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-cairo_in_fill() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_in_fill($context, 1, 1));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_in_fill();
-cairo_in_fill($context);
-cairo_in_fill($context, 1);
-cairo_in_fill($context, 1, 1, 1);
-
-// check arg types, should be int
-cairo_in_fill(1, 1, 1);
-cairo_in_fill($context, array(), 1);
-cairo_in_fill($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-bool(false)
-
-Warning: cairo_in_fill() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_in_fill() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_in_fill() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_in_fill() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_in_fill() must be an instance of CairoContext, integer given
-
-Warning: cairo_in_fill() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_in_fill() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_in_fill() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_in_stroke.phpt b/tests/CairoContext/cairo_in_stroke.phpt
deleted file mode 100644
index 55057c2f..00000000
--- a/tests/CairoContext/cairo_in_stroke.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-cairo_in_stroke() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_in_stroke($context, 1, 1));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 3
-cairo_in_stroke();
-cairo_in_stroke($context);
-cairo_in_stroke($context, 1);
-cairo_in_stroke($context, 1, 1, 1);
-
-// check arg types, should be int
-cairo_in_stroke(1, 1, 1);
-cairo_in_stroke($context, array(), 1);
-cairo_in_stroke($context, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-bool(false)
-
-Warning: cairo_in_stroke() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_in_stroke() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_in_stroke() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_in_stroke() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_in_stroke() must be an instance of CairoContext, integer given
-
-Warning: cairo_in_stroke() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_in_stroke() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_in_stroke() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_mask.phpt b/tests/CairoContext/cairo_mask.phpt
deleted file mode 100644
index 66771608..00000000
--- a/tests/CairoContext/cairo_mask.phpt
+++ /dev/null
@@ -1,53 +0,0 @@
---TEST--
-cairo_mask() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$pattern = cairo_pattern_create_rgb(0.3, 0.3, 0.3);
-var_dump($pattern);
-
-cairo_mask($context, $pattern);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1 or 2
-cairo_mask();
-cairo_mask($context);
-cairo_mask($context, $pattern, 1);
-
-// check arg types, should be int
-cairo_mask(1, $pattern);
-cairo_mask($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoSolidPattern)#%d (0) {
-}
-
-Warning: cairo_mask() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_mask() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_mask() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_mask() must be an instance of CairoContext, integer given
-
-Warning: cairo_mask() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_mask() must be an instance of CairoPattern, array given
-
-Warning: cairo_mask() expects parameter 2 to be CairoPattern, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_mask_surface.phpt b/tests/CairoContext/cairo_mask_surface.phpt
deleted file mode 100644
index 5782302d..00000000
--- a/tests/CairoContext/cairo_mask_surface.phpt
+++ /dev/null
@@ -1,62 +0,0 @@
---TEST--
-cairo_mask_surface() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_mask_surface($context, $surface, 1, 1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2 or 3 or 4
-cairo_mask_surface();
-cairo_mask_surface($context);
-cairo_mask_surface($context, $surface, 1, 1, 1);
-
-// check arg types, should be int
-cairo_mask_surface(1, $surface);
-cairo_mask_surface($context, array());
-cairo_mask_surface($context, $surface, array());
-cairo_mask_surface($context, $surface, 1, array());
-
-// DO NOT REMOVE: workaround for GC-related bug in 5.3
-die;
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_mask_surface() expects at least 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_mask_surface() expects at least 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_mask_surface() expects at most 4 parameters, 5 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_mask_surface() must be an instance of CairoContext, integer given
-
-Warning: cairo_mask_surface() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_mask_surface() must be an instance of CairoSurface, array given
-
-Warning: cairo_mask_surface() expects parameter 2 to be CairoSurface, array given in %s on line %d
-
-Warning: cairo_mask_surface() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_mask_surface() expects parameter 4 to be double, array given in %s on line %d
diff --git a/tests/CairoContext/cairo_paint.phpt b/tests/CairoContext/cairo_paint.phpt
deleted file mode 100644
index bc90e7e5..00000000
--- a/tests/CairoContext/cairo_paint.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_paint() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_paint($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_paint();
-cairo_paint($context, 1);
-
-// check arg types, should be CairoContext
-cairo_paint(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_paint() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_paint() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_paint() must be an instance of CairoContext, integer given
-
-Warning: cairo_paint() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_paint_with_alpha.phpt b/tests/CairoContext/cairo_paint_with_alpha.phpt
deleted file mode 100644
index 07dac3a0..00000000
--- a/tests/CairoContext/cairo_paint_with_alpha.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_paint_with_alpha() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_paint_with_alpha($context, 7);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1 or 2
-cairo_paint_with_alpha();
-cairo_paint_with_alpha($context);
-cairo_paint_with_alpha($context, 1, 1);
-
-// check arg types, should be context, double
-cairo_paint_with_alpha(1, 1);
-cairo_paint_with_alpha($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_paint_with_alpha() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_paint_with_alpha() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_paint_with_alpha() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_paint_with_alpha() must be an instance of CairoContext, integer given
-
-Warning: cairo_paint_with_alpha() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_paint_with_alpha() expects parameter 2 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_pop_group.phpt b/tests/CairoContext/cairo_pop_group.phpt
deleted file mode 100644
index fc4cfe3e..00000000
--- a/tests/CairoContext/cairo_pop_group.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-cairo_pop_group() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_push_group($context);
-$pattern = cairo_pop_group($context);
-var_dump($pattern);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// Check number of args - should only accept ONE
-cairo_pop_group();
-cairo_pop_group($context, 1);
-
-// Accept correct type!
-cairo_pop_group(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoSurfacePattern)#%d (0) {
-}
-
-Warning: cairo_pop_group() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_pop_group() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_pop_group() must be an instance of CairoContext, integer given
-
-Warning: cairo_pop_group() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_pop_group_to_source.phpt b/tests/CairoContext/cairo_pop_group_to_source.phpt
deleted file mode 100644
index a39c58e6..00000000
--- a/tests/CairoContext/cairo_pop_group_to_source.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_pop_group_to_source function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_push_group($context);
-
-cairo_pop_group_to_source($context);
-var_dump(cairo_get_source($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong parameters */
-cairo_pop_group_to_source();
-cairo_pop_group_to_source($context, 1);
-
-/* wrong type */
-cairo_pop_group_to_source(1);
-
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoSurfacePattern)#%d (0) {
-}
-
-Warning: cairo_pop_group_to_source() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_pop_group_to_source() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_pop_group_to_source() must be an instance of CairoContext, integer given
-
-Warning: cairo_pop_group_to_source() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_push_group.phpt b/tests/CairoContext/cairo_push_group.phpt
deleted file mode 100644
index 1e450281..00000000
--- a/tests/CairoContext/cairo_push_group.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_push_group function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_push_group($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_push_group();
-cairo_push_group($context, 1);
-
-// check arg types, should be context object
-cairo_push_group(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_push_group() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_push_group() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_push_group() must be an instance of CairoContext, integer given
-
-Warning: cairo_push_group() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_push_group_with_content.phpt b/tests/CairoContext/cairo_push_group_with_content.phpt
deleted file mode 100644
index 9c703b5c..00000000
--- a/tests/CairoContext/cairo_push_group_with_content.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_push_group_with_content function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_push_group_with_content($context, CAIRO_CONTENT_COLOR);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept only 2
-cairo_push_group_with_content();
-cairo_push_group_with_content($context);
-cairo_push_group_with_content($context, 1, 1);
-
-// check arg types, should be context object, int
-cairo_push_group_with_content(1, 1);
-cairo_push_group_with_content($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_push_group_with_content() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_push_group_with_content() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_push_group_with_content() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_push_group_with_content() must be an instance of CairoContext, integer given
-
-Warning: cairo_push_group_with_content() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_push_group_with_content() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_reset_clip.phpt b/tests/CairoContext/cairo_reset_clip.phpt
deleted file mode 100644
index 40f60c50..00000000
--- a/tests/CairoContext/cairo_reset_clip.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_reset_clip() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_reset_clip($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_reset_clip();
-cairo_reset_clip($context, 1);
-
-// check arg types, should be CairoContext
-cairo_reset_clip(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_reset_clip() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_reset_clip() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_reset_clip() must be an instance of CairoContext, integer given
-
-Warning: cairo_reset_clip() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_restore.phpt b/tests/CairoContext/cairo_restore.phpt
deleted file mode 100644
index bb85109c..00000000
--- a/tests/CairoContext/cairo_restore.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-cairo_restore function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_save($context);
-cairo_restore($context);
-cairo_restore($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_restore();
-cairo_restore($context, 1);
-
-// check arg types, should be context object
-cairo_restore(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_restore(): cairo_restore() without matching cairo_save() in %s on line %d
-
-Warning: cairo_restore() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_restore() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_restore() must be an instance of CairoContext, integer given
-
-Warning: cairo_restore() expects parameter 1 to be CairoContext, integer given in %s on line %d
diff --git a/tests/CairoContext/cairo_save.phpt b/tests/CairoContext/cairo_save.phpt
deleted file mode 100644
index f91bf689..00000000
--- a/tests/CairoContext/cairo_save.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_save function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_save($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_save();
-cairo_save($context, 1);
-
-// check arg types, should be context object
-cairo_save(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_save() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_save() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_save() must be an instance of CairoContext, integer given
-
-Warning: cairo_save() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_antialias.phpt b/tests/CairoContext/cairo_set_antialias.phpt
deleted file mode 100644
index a17a92b6..00000000
--- a/tests/CairoContext/cairo_set_antialias.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-cairo_set_antialias function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_antialias($context, CAIRO_ANTIALIAS_GRAY);
-var_dump(cairo_get_antialias($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1 or 2
-cairo_set_antialias();
-cairo_set_antialias($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_antialias(1, 1);
-cairo_set_antialias($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(2)
-
-Warning: cairo_set_antialias() expects at least 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_set_antialias() expects at most 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_antialias() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_antialias() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_antialias() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_dash.phpt b/tests/CairoContext/cairo_set_dash.phpt
deleted file mode 100644
index d265c1da..00000000
--- a/tests/CairoContext/cairo_set_dash.phpt
+++ /dev/null
@@ -1,65 +0,0 @@
---TEST--
-cairo_set_dash function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_dash($context, array(1,2,3));
-var_dump(cairo_get_dash($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2 or 3
-cairo_set_dash();
-cairo_set_dash($context);
-cairo_set_dash($context, array(), 3, 3);
-
-// check arg types, should be context object, array of double, double
-cairo_set_dash(1, array(1, 2,3), 3);
-cairo_set_dash($context, 1, 3);
-cairo_set_dash($context, array(1, 2,3), array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(2) {
-  ["dashes"]=>
-  array(3) {
-    [0]=>
-    float(1)
-    [1]=>
-    float(2)
-    [2]=>
-    float(3)
-  }
-  ["offset"]=>
-  float(0)
-}
-
-Warning: cairo_set_dash() expects at least 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_dash() expects at least 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_dash() expects at most 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_dash() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_dash() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_dash() must be %s array, integer given
-
-Warning: cairo_set_dash() expects parameter 2 to be array, integer given in %s on line %d
-
-Warning: cairo_set_dash() expects parameter 3 to be double, array given in %s on line %d
diff --git a/tests/CairoContext/cairo_set_fill_rule.phpt b/tests/CairoContext/cairo_set_fill_rule.phpt
deleted file mode 100644
index ced3ef8f..00000000
--- a/tests/CairoContext/cairo_set_fill_rule.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_set_fill_rule() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_fill_rule($context, CAIRO_FILL_RULE_EVEN_ODD);
-var_dump(cairo_get_fill_rule($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_set_fill_rule();
-cairo_set_fill_rule($context);
-cairo_set_fill_rule($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_fill_rule(1, 1);
-cairo_set_fill_rule($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(1)
-
-Warning: cairo_set_fill_rule() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_fill_rule() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_fill_rule() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_fill_rule() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_fill_rule() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_fill_rule() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_line_cap.phpt b/tests/CairoContext/cairo_set_line_cap.phpt
deleted file mode 100644
index b86cc587..00000000
--- a/tests/CairoContext/cairo_set_line_cap.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_set_line_cap() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_line_cap($context, CAIRO_LINE_CAP_SQUARE);
-var_dump(cairo_get_line_cap($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_set_line_cap();
-cairo_set_line_cap($context);
-cairo_set_line_cap($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_line_cap(1, 1);
-cairo_set_line_cap($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(2)
-
-Warning: cairo_set_line_cap() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_line_cap() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_line_cap() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_line_cap() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_line_cap() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_line_cap() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_line_join.phpt b/tests/CairoContext/cairo_set_line_join.phpt
deleted file mode 100644
index 283ca987..00000000
--- a/tests/CairoContext/cairo_set_line_join.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_set_line_join() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_line_join($context, CAIRO_LINE_JOIN_ROUND);
-var_dump(cairo_get_line_join($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_set_line_join();
-cairo_set_line_join($context);
-cairo_set_line_join($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_line_join(1, 1);
-cairo_set_line_join($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(1)
-
-Warning: cairo_set_line_join() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_line_join() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_line_join() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_line_join() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_line_join() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_line_join() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_line_width.phpt b/tests/CairoContext/cairo_set_line_width.phpt
deleted file mode 100644
index 02de85e0..00000000
--- a/tests/CairoContext/cairo_set_line_width.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_set_line_width() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_line_width($context, 8);
-var_dump(cairo_get_line_width($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_set_line_width();
-cairo_set_line_width($context);
-cairo_set_line_width($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_line_width(1, 1);
-cairo_set_line_width($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-float(8)
-
-Warning: cairo_set_line_width() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_line_width() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_line_width() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_line_width() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_line_width() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_line_width() expects parameter 2 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_miter_limit.phpt b/tests/CairoContext/cairo_set_miter_limit.phpt
deleted file mode 100644
index c04cb808..00000000
--- a/tests/CairoContext/cairo_set_miter_limit.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_set_miter_limit() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_miter_limit($context, 2);
-var_dump(cairo_get_miter_limit($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_set_miter_limit();
-cairo_set_miter_limit($context);
-cairo_set_miter_limit($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_miter_limit(1, 1);
-cairo_set_miter_limit($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-float(2)
-
-Warning: cairo_set_miter_limit() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_miter_limit() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_miter_limit() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_miter_limit() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_miter_limit() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_miter_limit() expects parameter 2 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_operator.phpt b/tests/CairoContext/cairo_set_operator.phpt
deleted file mode 100644
index bf4adc0f..00000000
--- a/tests/CairoContext/cairo_set_operator.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_set_operator() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_operator($context, CAIRO_OPERATOR_DEST_OVER);
-var_dump(cairo_get_operator($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 2
-cairo_set_operator();
-cairo_set_operator($context);
-cairo_set_operator($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_operator(1, 1);
-cairo_set_operator($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(7)
-
-Warning: cairo_set_operator() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_operator() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_operator() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_operator() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_operator() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_operator() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_source.phpt b/tests/CairoContext/cairo_set_source.phpt
deleted file mode 100644
index e6f04a94..00000000
--- a/tests/CairoContext/cairo_set_source.phpt
+++ /dev/null
@@ -1,85 +0,0 @@
---TEST--
-cairo_set_source function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$pattern = cairo_pattern_create_rgb(0.3, 0.3, 0.3);
-var_dump($pattern);
-
-cairo_set_source($context, $pattern);
-var_dump(cairo_pattern_get_rgba(cairo_get_source($context)));
-
-$pattern = cairo_pattern_create_rgb(0.5, 0.5, 0.5);
-var_dump($pattern);
-
-cairo_set_source($context, $pattern);
-
-var_dump(cairo_pattern_get_rgba(cairo_get_source($context)));
-
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_set_source();
-cairo_set_source($context);
-cairo_set_source($context, $pattern, 1);
-
-/* wrong types */
-cairo_set_source(1, $pattern);
-cairo_set_source($context, 1);
-
-// DO NOT REMOVE: workaround for GC-related bug in 5.3
-die;
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoSolidPattern)#%d (0) {
-}
-array(4) {
-  ["red"]=>
-  float(0.3)
-  ["green"]=>
-  float(0.3)
-  ["blue"]=>
-  float(0.3)
-  ["alpha"]=>
-  float(1)
-}
-object(CairoSolidPattern)#%d (0) {
-}
-array(4) {
-  ["red"]=>
-  float(0.5)
-  ["green"]=>
-  float(0.5)
-  ["blue"]=>
-  float(0.5)
-  ["alpha"]=>
-  float(1)
-}
-
-Warning: cairo_set_source() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_source() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_source() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_source() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_source() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_source() must be an instance of CairoPattern, integer given
-
-Warning: cairo_set_source() expects parameter 2 to be CairoPattern, integer given in %s on line %d
diff --git a/tests/CairoContext/cairo_set_source_rgb.phpt b/tests/CairoContext/cairo_set_source_rgb.phpt
deleted file mode 100644
index 8dfa5041..00000000
--- a/tests/CairoContext/cairo_set_source_rgb.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-cairo_set_source_rgb function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-$x = $surface;
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_source_rgb($context, 0.1, 0.1, 0.1);
-
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// 4 args
-cairo_set_source_rgb();
-cairo_set_source_rgb($context);
-cairo_set_source_rgb($context, 1);
-cairo_set_source_rgb($context, 1, 1);
-cairo_set_source_rgb($context, 1, 1, 1, 1);
-
-// types
-cairo_set_source_rgb(array(), 1, 1, 1);
-cairo_set_source_rgb($context, array(), 1, 1);
-cairo_set_source_rgb($context, 1, array(), 1);
-cairo_set_source_rgb($context, 1, 1, array());
-
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_set_source_rgb() expects exactly 4 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_source_rgb() expects exactly 4 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_source_rgb() expects exactly 4 parameters, 2 given in %s on line %d
-
-Warning: cairo_set_source_rgb() expects exactly 4 parameters, 3 given in %s on line %d
-
-Warning: cairo_set_source_rgb() expects exactly 4 parameters, 5 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_source_rgb() must be an instance of CairoContext, array given
-
-Warning: cairo_set_source_rgb() expects parameter 1 to be CairoContext, array given in %s on line %d
-
-Warning: cairo_set_source_rgb() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_set_source_rgb() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_set_source_rgb() expects parameter 4 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_source_rgba.phpt b/tests/CairoContext/cairo_set_source_rgba.phpt
deleted file mode 100644
index 9a52404b..00000000
--- a/tests/CairoContext/cairo_set_source_rgba.phpt
+++ /dev/null
@@ -1,65 +0,0 @@
---TEST--
-cairo_set_source_rgba() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_source_rgba($context, 0.1, 0.1, 0.1, 0.5);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-    echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// 5 args
-cairo_set_source_rgba();
-cairo_set_source_rgba($context);
-cairo_set_source_rgba($context, 1);
-cairo_set_source_rgba($context, 1, 1);
-cairo_set_source_rgba($context, 1, 1, 1);
-cairo_set_source_rgba($context, 1, 1, 1, 1, 1);
-
-// types
-cairo_set_source_rgba(array(), 1, 1, 1, 1);
-cairo_set_source_rgba($context, array(), 1, 1, 1);
-cairo_set_source_rgba($context, 1, array(), 1, 1);
-cairo_set_source_rgba($context, 1, 1, array(), 1);
-cairo_set_source_rgba($context, 1, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_set_source_rgba() expects exactly 5 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects exactly 5 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects exactly 5 parameters, 2 given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects exactly 5 parameters, 3 given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects exactly 5 parameters, 4 given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects exactly 5 parameters, 6 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_source_rgba() must be an instance of CairoContext, array given
-
-Warning: cairo_set_source_rgba() expects parameter 1 to be CairoContext, array given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects parameter 4 to be double, array given in %s on line %d
-
-Warning: cairo_set_source_rgba() expects parameter 5 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_source_surface.phpt b/tests/CairoContext/cairo_set_source_surface.phpt
deleted file mode 100644
index a129bd4e..00000000
--- a/tests/CairoContext/cairo_set_source_surface.phpt
+++ /dev/null
@@ -1,67 +0,0 @@
---TEST--
-cairo_set_source_surface() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$surface2 = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface2);
-
-$pattern = cairo_pattern_create_rgb(0.5, 0.5, 0.5);
-var_dump($pattern);
-
-cairo_set_source($context, $pattern);
-
-cairo_set_source_surface($context, $surface2, 5, 5);
-
-function bad_class($errno, $errstr) {
-  echo 'CAUGHT ERROR: ' , $errstr, PHP_EOL;
-}
-
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_set_source_surface();
-cairo_set_source_surface($context);
-cairo_set_source_surface($context, $surface2, 5, 5, 5);
-
-/* wrong types */
-cairo_set_source_surface(1, $surface2);
-cairo_set_source_surface($context, 1);
-cairo_set_source_surface($context, $surface2, array());
-cairo_set_source_surface($context, $surface2, 5, array());
-
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoSolidPattern)#%d (0) {
-}
-
-Warning: cairo_set_source_surface() expects at least 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_source_surface() expects at least 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_source_surface() expects at most 4 parameters, 5 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_source_surface() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_source_surface() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_source_surface() must be an instance of CairoSurface, integer given
-
-Warning: cairo_set_source_surface() expects parameter 2 to be CairoSurface, integer given in %s on line %d
-
-Warning: cairo_set_source_surface() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_set_source_surface() expects parameter 4 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_set_tolerance.phpt b/tests/CairoContext/cairo_set_tolerance.phpt
deleted file mode 100644
index 289fccf8..00000000
--- a/tests/CairoContext/cairo_set_tolerance.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_set_tolerance() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_set_tolerance($context, 7);
-var_dump(cairo_get_tolerance($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept 1 or 2
-cairo_set_tolerance();
-cairo_set_tolerance($context);
-cairo_set_tolerance($context, 1, 1);
-
-// check arg types, should be int
-cairo_set_tolerance(1, 1);
-cairo_set_tolerance($context, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-float(7)
-
-Warning: cairo_set_tolerance() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_set_tolerance() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_set_tolerance() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_set_tolerance() must be an instance of CairoContext, integer given
-
-Warning: cairo_set_tolerance() expects parameter 1 to be CairoContext, integer given in %s on line %d
-
-Warning: cairo_set_tolerance() expects parameter 2 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_show_page.phpt b/tests/CairoContext/cairo_show_page.phpt
deleted file mode 100644
index 509d116c..00000000
--- a/tests/CairoContext/cairo_show_page.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_show_page function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_show_page($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-/* wrong params */
-cairo_show_page();
-cairo_show_page($context, 1);
-
-/* wrong types */
-cairo_show_page(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_show_page() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_show_page() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_show_page() must be an instance of CairoContext, integer given
-
-Warning: cairo_show_page() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_status.phpt b/tests/CairoContext/cairo_status.phpt
deleted file mode 100644
index c540ec33..00000000
--- a/tests/CairoContext/cairo_status.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-cairo_status function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-$status = cairo_status($context);
-var_dump($status);
-
-var_dump($status == CAIRO_STATUS_SUCCESS);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_status();
-cairo_status($context, 1);
-
-// check arg types, should be context object
-cairo_status(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-int(0)
-bool(true)
-
-Warning: cairo_status() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_status() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_status() must be an instance of CairoContext, integer given
-
-Warning: cairo_status() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_stroke.phpt b/tests/CairoContext/cairo_stroke.phpt
deleted file mode 100644
index 82d4eb26..00000000
--- a/tests/CairoContext/cairo_stroke.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_stroke() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_stroke($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_stroke();
-cairo_stroke($context, 1);
-
-// check arg types, should be CairoContext
-cairo_stroke(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_stroke() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_stroke() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_stroke() must be an instance of CairoContext, integer given
-
-Warning: cairo_stroke() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_stroke_extents.phpt b/tests/CairoContext/cairo_stroke_extents.phpt
deleted file mode 100644
index 1d8a6090..00000000
--- a/tests/CairoContext/cairo_stroke_extents.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-cairo_stroke_extents() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-var_dump(cairo_stroke_extents($context));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_stroke_extents();
-cairo_stroke_extents($context, 1);
-
-// check arg types, should be CairoContext
-cairo_stroke_extents(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-array(4) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(0)
-  [2]=>
-  float(0)
-  [3]=>
-  float(0)
-}
-
-Warning: cairo_stroke_extents() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_stroke_extents() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_stroke_extents() must be an instance of CairoContext, integer given
-
-Warning: cairo_stroke_extents() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/cairo_stroke_preserve.phpt b/tests/CairoContext/cairo_stroke_preserve.phpt
deleted file mode 100644
index 8f5e4c12..00000000
--- a/tests/CairoContext/cairo_stroke_preserve.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_stroke_preserve() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$context = cairo_create($surface);
-var_dump($context);
-
-cairo_stroke_preserve($context);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_stroke_preserve();
-cairo_stroke_preserve($context, 1);
-
-// check arg types, should be CairoContext
-cairo_stroke_preserve(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoContext)#%d (0) {
-}
-
-Warning: cairo_stroke_preserve() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_stroke_preserve() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_stroke_preserve() must be an instance of CairoContext, integer given
-
-Warning: cairo_stroke_preserve() expects parameter 1 to be CairoContext, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoContext/clip.phpt b/tests/CairoContext/clip.phpt
index b5b537c2..45559dc5 100644
--- a/tests/CairoContext/clip.phpt
+++ b/tests/CairoContext/clip.phpt
@@ -1,27 +1,27 @@
 --TEST--
-CairoContext->clip() method
+Cairo\Context->clip() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->clip();
 try {
     $context->clip('foo');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::clip() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::clip() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/clipExtents.phpt b/tests/CairoContext/clipExtents.phpt
index 0fc0109a..688893ac 100644
--- a/tests/CairoContext/clipExtents.phpt
+++ b/tests/CairoContext/clipExtents.phpt
@@ -1,28 +1,28 @@
 --TEST--
-CairoContext->clipExtents() method
+Cairo\Context->clipExtents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->clipExtents());
 try {
     $context->clipExtents('foo');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(4) {
   [0]=>
@@ -34,4 +34,4 @@ array(4) {
   [3]=>
   float(50)
 }
-CairoContext::clipExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::clipExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/clipPreserve.phpt b/tests/CairoContext/clipPreserve.phpt
index a769ba02..1e86b209 100644
--- a/tests/CairoContext/clipPreserve.phpt
+++ b/tests/CairoContext/clipPreserve.phpt
@@ -1,28 +1,28 @@
 --TEST--
-CairoContext->clipPreserve() method
+Cairo\Context->clipPreserve() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->clipPreserve();
 
 try {
     $context->clipPreserve('foo');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::clipPreserve() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::clipPreserve() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/clipRectangleList.phpt b/tests/CairoContext/clipRectangleList.phpt
index 85f6e6c2..d3eb089e 100644
--- a/tests/CairoContext/clipRectangleList.phpt
+++ b/tests/CairoContext/clipRectangleList.phpt
@@ -1,29 +1,29 @@
 --TEST--
-CairoContext->clipRectangleList() method
+Cairo\Context->clipRectangleList() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->clipRectangleList());
 
 try {
     $context->clipRectangleList('foo');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(1) {
   [0]=>
@@ -38,4 +38,4 @@ array(1) {
     float(50)
   }
 }
-CairoContext::clipRectangleList() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::clipRectangleList() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/copyPage.phpt b/tests/CairoContext/copyPage.phpt
index 04c5cb70..71bf27d4 100644
--- a/tests/CairoContext/copyPage.phpt
+++ b/tests/CairoContext/copyPage.phpt
@@ -1,27 +1,27 @@
 --TEST--
-CairoContext->copyPage() method
+Cairo\Context->copyPage() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->copyPage();
 try {
     $context->copyPage('foo');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::copyPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::copyPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/fill.phpt b/tests/CairoContext/fill.phpt
index a3c01d96..56b72d72 100644
--- a/tests/CairoContext/fill.phpt
+++ b/tests/CairoContext/fill.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->fill() method
+Cairo\Context->fill() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->fill();
@@ -18,13 +18,13 @@ $context->fill();
 try {
     $context->fill('foobar');
     trigger_error('fill requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::fill() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::fill() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/fillExtents.phpt b/tests/CairoContext/fillExtents.phpt
index ca54ca1f..4b1a2b5b 100644
--- a/tests/CairoContext/fillExtents.phpt
+++ b/tests/CairoContext/fillExtents.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->fillExtents() method
+Cairo\Context->fillExtents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->fillExtents());
@@ -18,14 +18,14 @@ var_dump($context->fillExtents());
 try {
     $context->fillExtents('foobar');
     trigger_error('fillExtents requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(4) {
   [0]=>
@@ -37,4 +37,4 @@ array(4) {
   [3]=>
   float(0)
 }
-CairoContext::fillExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::fillExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/fillPreserve.phpt b/tests/CairoContext/fillPreserve.phpt
index c287fbee..6b821ecf 100644
--- a/tests/CairoContext/fillPreserve.phpt
+++ b/tests/CairoContext/fillPreserve.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->fill() method
+Cairo\Context->fill() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->fillPreserve();
@@ -18,13 +18,13 @@ $context->fillPreserve();
 try {
     $context->fillPreserve('foobar');
     trigger_error('fillPreserve requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::fillPreserve() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::fillPreserve() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getAntialias.phpt b/tests/CairoContext/getAntialias.phpt
index 8b6835c4..8b72f4f3 100644
--- a/tests/CairoContext/getAntialias.phpt
+++ b/tests/CairoContext/getAntialias.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getAntialias() method
+Cairo\Context->getAntialias() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getAntialias());
@@ -18,14 +18,34 @@ var_dump($context->getAntialias());
 try {
     $context->getAntialias('foobar');
     trigger_error('getAntialias requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
-CairoContext::getAntialias() expects exactly 0 parameters, 1 given
\ No newline at end of file
+object(Cairo\Antialias)#3 (2) {
+  ["__elements"]=>
+  array(7) {
+    ["DEFAULT"]=>
+    int(0)
+    ["NONE"]=>
+    int(1)
+    ["GRAY"]=>
+    int(2)
+    ["SUBPIXEL"]=>
+    int(3)
+    ["FAST"]=>
+    int(4)
+    ["GOOD"]=>
+    int(5)
+    ["BEST"]=>
+    int(6)
+  }
+  ["__value"]=>
+  int(0)
+}
+Cairo\Context::getAntialias() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getDash.phpt b/tests/CairoContext/getDash.phpt
index 403028cd..df9aed9d 100644
--- a/tests/CairoContext/getDash.phpt
+++ b/tests/CairoContext/getDash.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getDash() method
+Cairo\Context->getDash() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getDash());
@@ -18,14 +18,14 @@ var_dump($context->getDash());
 try {
     $context->getDash('foo');
     trigger_error('getDash requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   ["dashes"]=>
@@ -34,4 +34,4 @@ array(2) {
   ["offset"]=>
   float(0)
 }
-CairoContext::getDash() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getDash() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getDashCount.phpt b/tests/CairoContext/getDashCount.phpt
index 76db46ac..2f801243 100644
--- a/tests/CairoContext/getDashCount.phpt
+++ b/tests/CairoContext/getDashCount.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getDashCount() method
+Cairo\Context->getDashCount() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getDashCount());
@@ -18,14 +18,14 @@ var_dump($context->getDashCount());
 try {
     $context->getDashCount('foo');
     trigger_error('getDashCount requires 0 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
-CairoContext::getDashCount() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\Context::getDashCount() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getFillRule.phpt b/tests/CairoContext/getFillRule.phpt
index e6e7c175..71f00d5f 100644
--- a/tests/CairoContext/getFillRule.phpt
+++ b/tests/CairoContext/getFillRule.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getFillRule() method
+Cairo\Context->getFillRule() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getFillRule());
@@ -18,14 +18,14 @@ var_dump($context->getFillRule());
 try {
     $context->getFillRule('foobar');
     trigger_error('getAntialias requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
-CairoContext::getFillRule() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\Context::getFillRule() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getGroupTarget.phpt b/tests/CairoContext/getGroupTarget.phpt
index 74cf3f55..ec4dbd93 100644
--- a/tests/CairoContext/getGroupTarget.phpt
+++ b/tests/CairoContext/getGroupTarget.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getGroupTarget() method
+Cairo\Context->getGroupTarget() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $surface2 = $context->getGroupTarget();
@@ -22,16 +22,16 @@ try {
 	$context->getGroupTarget(1);
 	trigger_error('getGroupTarget() expects 0 params');	
 }
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
 bool(true)
-CairoContext::getGroupTarget() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getGroupTarget() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getLineCap.phpt b/tests/CairoContext/getLineCap.phpt
index 5b4499c7..0beb6a66 100644
--- a/tests/CairoContext/getLineCap.phpt
+++ b/tests/CairoContext/getLineCap.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getLineCap() method
+Cairo\Context->getLineCap() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getLineCap());
@@ -18,14 +18,14 @@ var_dump($context->getLineCap());
 try {
     $context->getLineCap('foobar');
     trigger_error('getLineCap requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
-CairoContext::getLineCap() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\Context::getLineCap() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getLineJoin.phpt b/tests/CairoContext/getLineJoin.phpt
index 102db7a1..c92af60a 100644
--- a/tests/CairoContext/getLineJoin.phpt
+++ b/tests/CairoContext/getLineJoin.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getLineJoin() method
+Cairo\Context->getLineJoin() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->getLineJoin());
@@ -18,14 +18,14 @@ var_dump($context->getLineJoin());
 try {
     $context->getLineJoin('foobar');
     trigger_error('getLineJoin requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
-CairoContext::getLineJoin() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\Context::getLineJoin() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getLineWidth.phpt b/tests/CairoContext/getLineWidth.phpt
index 01b1d937..6b86067d 100644
--- a/tests/CairoContext/getLineWidth.phpt
+++ b/tests/CairoContext/getLineWidth.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getLineWidth() method
+Cairo\Context->getLineWidth() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setLineWidth(1);
@@ -19,17 +19,17 @@ var_dump($context->getLineWidth());
 /* wrong params */
 try {
 	$context->getLineWidth(1);
-	trigger_error('CairoContext->getLineWidth() expects 1 param');
+	trigger_error('Cairo\Context->getLineWidth() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 float(1)
-CairoContext::getLineWidth() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getLineWidth() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getMiterLimit.phpt b/tests/CairoContext/getMiterLimit.phpt
index 7b81b2bc..91bd1486 100644
--- a/tests/CairoContext/getMiterLimit.phpt
+++ b/tests/CairoContext/getMiterLimit.phpt
@@ -6,10 +6,10 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setMiterLimit(1);
@@ -20,14 +20,14 @@ try {
     $context->getMiterLimit('foobar');
     trigger_error('Cairo->getMiterLimit() expects no params');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 float(1)
-CairoContext::getMiterLimit() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getMiterLimit() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getOperator.phpt b/tests/CairoContext/getOperator.phpt
index c8e8648d..156460ab 100644
--- a/tests/CairoContext/getOperator.phpt
+++ b/tests/CairoContext/getOperator.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getOperator() function
+Cairo\Context->getOperator() function
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setOperator(CAIRO_FORMAT_ARGB32);
@@ -17,17 +17,17 @@ var_dump($context->getOperator());
 
 try {
     $context->getOperator(1);
-    trigger_error('CairoContext->getOperator expects 0 parameters.');
+    trigger_error('Cairo\Context->getOperator expects 0 parameters.');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
-CairoContext::getOperator() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\Context::getOperator() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getSource.phpt b/tests/CairoContext/getSource.phpt
index f262ccc4..32e27315 100644
--- a/tests/CairoContext/getSource.phpt
+++ b/tests/CairoContext/getSource.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getSource() method
+Cairo\Context->getSource() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $pattern = $context->getSource();
@@ -19,15 +19,15 @@ var_dump($pattern);
 try {
     $context->getSource('foobar');
     trigger_error('getSource requires no arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoSolidPattern)#%d (0) {
+object(Cairo\Pattern\Solid)#%d (0) {
 }
-CairoContext::getSource() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getSource() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getTarget.phpt b/tests/CairoContext/getTarget.phpt
index f6f5abed..0b5a7859 100644
--- a/tests/CairoContext/getTarget.phpt
+++ b/tests/CairoContext/getTarget.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getTarget() method
+Cairo\Context->getTarget() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $surface2 = $context->getTarget();
@@ -17,10 +17,10 @@ var_dump($surface2);
 var_dump($surface2 == $surface);
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
 bool(true)
\ No newline at end of file
diff --git a/tests/CairoContext/getTarget_custom_class.phpt b/tests/CairoContext/getTarget_custom_class.phpt
index 341cf9f6..23d8c721 100644
--- a/tests/CairoContext/getTarget_custom_class.phpt
+++ b/tests/CairoContext/getTarget_custom_class.phpt
@@ -1,19 +1,19 @@
 --TEST--
-CairoContext->getTarget() should return custom classes derived from CairoImageSurface
+Cairo\Context->getTarget() should return custom classes derived from Cairo\Surface\Image
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-class TestSurface extends CairoImageSurface {
+class TestSurface extends Cairo\Surface\Image {
     function __construct($format, $width, $height) {
         parent::__construct($format, $width, $height);
     }
 }
 
-$t = new TestSurface(CairoFormat::ARGB32, 500, 500);
-$c = new CairoContext($t);
+$t = new TestSurface(Cairo\Surface\ImageFormat::ARGB32, 500, 500);
+$c = new Cairo\Context($t);
 var_dump($c->getTarget() instanceof TestSurface);
 var_dump($c->getTarget() instanceof TestSurface);
 unset($t);
diff --git a/tests/CairoContext/getTarget_errors.phpt b/tests/CairoContext/getTarget_errors.phpt
index 269779ea..c4d8c9ff 100644
--- a/tests/CairoContext/getTarget_errors.phpt
+++ b/tests/CairoContext/getTarget_errors.phpt
@@ -1,27 +1,27 @@
 --TEST--
-CairoContext->getTarget() error conditions
+Cairo\Context->getTarget() error conditions
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 try {
 	$context->getTarget('foobar');
 	echo 'Exception not thrown properly';
-} catch (CairoException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::getTarget() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getTarget() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/getTolerance.phpt b/tests/CairoContext/getTolerance.phpt
index 840214f5..f8c223dd 100644
--- a/tests/CairoContext/getTolerance.phpt
+++ b/tests/CairoContext/getTolerance.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->getTolerance() function
+Cairo\Context->getTolerance() function
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setTolerance(1);
@@ -17,17 +17,17 @@ var_dump($context->getTolerance());
 
 try {
     $context->getTolerance(1);
-    trigger_error('CairoContext->getTolerance expects 0 parameters.');
+    trigger_error('Cairo\Context->getTolerance expects 0 parameters.');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#1 (0) {
+object(Cairo\Surface\Image)#1 (0) {
 }
-object(CairoContext)#2 (0) {
+object(Cairo\Context)#2 (0) {
 }
 float(1)
-CairoContext::getTolerance() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::getTolerance() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/inFill.phpt b/tests/CairoContext/inFill.phpt
index 202671cd..d376307c 100644
--- a/tests/CairoContext/inFill.phpt
+++ b/tests/CairoContext/inFill.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->inFill() method
+Cairo\Context->inFill() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->inFill(1, 1));
@@ -18,7 +18,7 @@ var_dump($context->inFill(1, 1));
 try {
     $context->inFill();
     trigger_error('inFill requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->inFill(1);
     trigger_error('inFill requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->inFill(1, 1, 1);
     trigger_error('inFill requires only 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->inFill(array(), 1);
     trigger_error('inFill requires double for arg 1');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,18 +50,18 @@ try {
 try {
     $context->inFill(1, array());
     trigger_error('inFill requires double for arg 2');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 bool(false)
-CairoContext::inFill() expects exactly 2 parameters, 0 given
-CairoContext::inFill() expects exactly 2 parameters, 1 given
-CairoContext::inFill() expects exactly 2 parameters, 3 given
-CairoContext::inFill() expects parameter 1 to be double, array given
-CairoContext::inFill() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::inFill() expects exactly 2 parameters, 0 given
+Cairo\Context::inFill() expects exactly 2 parameters, 1 given
+Cairo\Context::inFill() expects exactly 2 parameters, 3 given
+Cairo\Context::inFill() expects parameter 1 to be float, array given
+Cairo\Context::inFill() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/inStroke.phpt b/tests/CairoContext/inStroke.phpt
index 6af2d35f..1e364aa2 100644
--- a/tests/CairoContext/inStroke.phpt
+++ b/tests/CairoContext/inStroke.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->inStroke() method
+Cairo\Context->inStroke() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->inStroke(1, 1));
@@ -18,7 +18,7 @@ var_dump($context->inStroke(1, 1));
 try {
     $context->inStroke();
     trigger_error('inStroke requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->inStroke(1);
     trigger_error('inStroke requires 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,7 +34,7 @@ try {
 try {
     $context->inStroke(1, 1, 1);
     trigger_error('inStroke requires only 2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -42,7 +42,7 @@ try {
 try {
     $context->inStroke(array(), 1);
     trigger_error('inStroke requires double for arg 1');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -50,18 +50,18 @@ try {
 try {
     $context->inStroke(1, array());
     trigger_error('inStroke requires double for arg 2');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 bool(false)
-CairoContext::inStroke() expects exactly 2 parameters, 0 given
-CairoContext::inStroke() expects exactly 2 parameters, 1 given
-CairoContext::inStroke() expects exactly 2 parameters, 3 given
-CairoContext::inStroke() expects parameter 1 to be double, array given
-CairoContext::inStroke() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Context::inStroke() expects exactly 2 parameters, 0 given
+Cairo\Context::inStroke() expects exactly 2 parameters, 1 given
+Cairo\Context::inStroke() expects exactly 2 parameters, 3 given
+Cairo\Context::inStroke() expects parameter 1 to be float, array given
+Cairo\Context::inStroke() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/mask.phpt b/tests/CairoContext/mask.phpt
index 01089fef..a41d3abb 100644
--- a/tests/CairoContext/mask.phpt
+++ b/tests/CairoContext/mask.phpt
@@ -1,18 +1,18 @@
 --TEST--
-CairoContext->mask() function
+Cairo\Context->mask() function
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$pattern = new CairoSolidPattern(0.3, 0.3, 0.3);
+$pattern = new Cairo\Pattern\Solid(0.3, 0.3, 0.3);
 $context->mask($pattern);
 
 /* wrong params */
@@ -20,14 +20,14 @@ try {
     $context->mask();
     trigger_error('Wrong params');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 try {
     $context->mask($pattern, 1);
     trigger_error('Wrong params');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -36,15 +36,15 @@ try {
 	$context->mask(array());
 	trigger_error('Wrong type');
 }
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::mask() expects exactly 1 parameter, 0 given
-CairoContext::mask() expects exactly 1 parameter, 2 given
-CairoContext::mask() expects parameter 1 to be CairoPattern, array given
\ No newline at end of file
+Cairo\Context::mask() expects exactly 1 parameter, 0 given
+Cairo\Context::mask() expects exactly 1 parameter, 2 given
+Cairo\Context::mask() expects parameter 1 to be CairoPattern, array given
\ No newline at end of file
diff --git a/tests/CairoContext/maskSurface.phpt b/tests/CairoContext/maskSurface.phpt
index 274df022..975da92b 100644
--- a/tests/CairoContext/maskSurface.phpt
+++ b/tests/CairoContext/maskSurface.phpt
@@ -1,18 +1,18 @@
 --TEST--
-CairoContext->maskSurface() function
+Cairo\Context->maskSurface() function
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$surface2 = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface2 = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface2);
 
 $context->maskSurface($surface2, 5, 1);
@@ -22,23 +22,23 @@ try {
     $context->maskSurface();
     trigger_error('maskSurface expects at least 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 try {
     $context->maskSurface($surface2, 1, 1, 1);
     trigger_error('maskSurface expects at most 3 params');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 /* wrong type */
 try {
 	$context->maskSurface(array());
-	trigger_error('maskSurface arg 1 expects CairoSurface');
+	trigger_error('maskSurface arg 1 expects Cairo\Surface');
 }
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -47,7 +47,7 @@ try {
 	$context->maskSurface($surface2, array());
 	trigger_error('maskSurface arg 2 expects double');
 }
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -56,19 +56,19 @@ try {
 	$context->maskSurface($surface2, 1, array());
 	trigger_error('maskSurface arg 1 expects double');
 }
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoContext::maskSurface() expects at least 1 parameter, 0 given
-CairoContext::maskSurface() expects at most 3 parameters, 4 given
-CairoContext::maskSurface() expects parameter 1 to be CairoSurface, array given
-CairoContext::maskSurface() expects parameter 2 to be double, array given
-CairoContext::maskSurface() expects parameter 3 to be double, array given
\ No newline at end of file
+Cairo\Context::maskSurface() expects at least 1 parameter, 0 given
+Cairo\Context::maskSurface() expects at most 3 parameters, 4 given
+Cairo\Context::maskSurface() expects parameter 1 to be Cairo\Surface, array given
+Cairo\Context::maskSurface() expects parameter 2 to be float, array given
+Cairo\Context::maskSurface() expects parameter 3 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/paint.phpt b/tests/CairoContext/paint.phpt
index 545f8ef3..871f1f96 100644
--- a/tests/CairoContext/paint.phpt
+++ b/tests/CairoContext/paint.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->paint() method
+Cairo\Context->paint() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->paint();
@@ -18,13 +18,13 @@ $context->paint();
 try {
     $context->paint('foobar');
     trigger_error('paint requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::paint() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::paint() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/paintWithAlpha.phpt b/tests/CairoContext/paintWithAlpha.phpt
index 9c2551a1..91f3396d 100644
--- a/tests/CairoContext/paintWithAlpha.phpt
+++ b/tests/CairoContext/paintWithAlpha.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->paintWithAlpha() method
+Cairo\Context->paintWithAlpha() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->paintWithAlpha(0);
@@ -18,7 +18,7 @@ $context->paintWithAlpha(0);
 try {
     $context->paintWithAlpha();
     trigger_error('paintWithAlpha requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->paintWithAlpha(1, 1);
     trigger_error('paintWithAlpha requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,15 +34,15 @@ try {
 try {
     $context->paintWithAlpha(array());
     trigger_error('paintWithAlpha requires double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::paintWithAlpha() expects exactly 1 parameter, 0 given
-CairoContext::paintWithAlpha() expects exactly 1 parameter, 2 given
-CairoContext::paintWithAlpha() expects parameter 1 to be double, array given
\ No newline at end of file
+Cairo\Context::paintWithAlpha() expects exactly 1 parameter, 0 given
+Cairo\Context::paintWithAlpha() expects exactly 1 parameter, 2 given
+Cairo\Context::paintWithAlpha() expects parameter 1 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/popGroup.phpt b/tests/CairoContext/popGroup.phpt
index eec05156..5b7c643b 100644
--- a/tests/CairoContext/popGroup.phpt
+++ b/tests/CairoContext/popGroup.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->popGroup() method
+Cairo\Context->popGroup() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->pushGroup();
@@ -20,15 +20,15 @@ var_dump($pattern);
 try {
     $context->popGroup('foo');
     trigger_error('popGroup requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoSurfacePattern)#%d (0) {
+object(Cairo\SurfacePattern)#%d (0) {
 }
-CairoContext::popGroup() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::popGroup() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/popGroupToSource.phpt b/tests/CairoContext/popGroupToSource.phpt
index 4e3a9ccc..b115fb62 100644
--- a/tests/CairoContext/popGroupToSource.phpt
+++ b/tests/CairoContext/popGroupToSource.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->popGroupToSource() method
+Cairo\Context->popGroupToSource() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->pushGroup();
@@ -22,16 +22,16 @@ try {
 	$context->popGroupToSource(1);
 	trigger_error('popGroupToSource() expects 0 params');	
 }
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoSurfacePattern)#%d (0) {
+object(Cairo\SurfacePattern)#%d (0) {
 }
-CairoContext::popGroupToSource() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::popGroupToSource() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/pushGroup.phpt b/tests/CairoContext/pushGroup.phpt
index 2936d086..ce804328 100644
--- a/tests/CairoContext/pushGroup.phpt
+++ b/tests/CairoContext/pushGroup.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->pushGroup() method
+Cairo\Context->pushGroup() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->pushGroup();
@@ -18,13 +18,13 @@ $context->pushGroup();
 try {
     $context->pushGroup('foo');
     trigger_error('save requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::pushGroup() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::pushGroup() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/pushGroupWithContent.phpt b/tests/CairoContext/pushGroupWithContent.phpt
index f7bb7148..4db6be71 100644
--- a/tests/CairoContext/pushGroupWithContent.phpt
+++ b/tests/CairoContext/pushGroupWithContent.phpt
@@ -1,24 +1,24 @@
 --TEST--
-CairoContext->pushGroupWithContent() method
+Cairo\Context->pushGroupWithContent() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$context->pushGroupWithContent(CairoContent::COLOR);
+$context->pushGroupWithContent(Cairo\Surface\Content::COLOR);
 
 /* Wrong number args - needs 1 */
 try {
     $context->pushGroupWithContent();
     trigger_error('pushGroupWithContent requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -26,7 +26,7 @@ try {
 try {
     $context->pushGroupWithContent(1, 1);
     trigger_error('pushGroupWithContent requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -34,15 +34,15 @@ try {
 try {
     $context->pushGroupWithContent(array());
     trigger_error('pushGroupWithContent arg one must be int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::pushGroupWithContent() expects exactly 1 parameter, 0 given
-CairoContext::pushGroupWithContent() expects exactly 1 parameter, 2 given
-CairoContext::pushGroupWithContent() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\Context::pushGroupWithContent() expects exactly 1 parameter, 0 given
+Cairo\Context::pushGroupWithContent() expects exactly 1 parameter, 2 given
+Cairo\Context::pushGroupWithContent() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/resetClip.phpt b/tests/CairoContext/resetClip.phpt
index 1bac0ba6..6d80c581 100644
--- a/tests/CairoContext/resetClip.phpt
+++ b/tests/CairoContext/resetClip.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->resetClip() method
+Cairo\Context->resetClip() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->resetClip();
@@ -18,13 +18,13 @@ $context->resetClip();
 try {
     $context->resetClip('foobar');
     trigger_error('resetClip requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::resetClip() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::resetClip() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/restore.phpt b/tests/CairoContext/restore.phpt
index 0618b302..0017e24e 100644
--- a/tests/CairoContext/restore.phpt
+++ b/tests/CairoContext/restore.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->restore() method
+Cairo\Context->restore() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->save();
@@ -19,7 +19,7 @@ $context->restore();
 try {
     $context->restore();
     trigger_error('save requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -27,14 +27,14 @@ try {
 try {
     $context->restore('foo');
     trigger_error('save requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 cairo_restore() without matching cairo_save()
-CairoContext::restore() expects exactly 0 parameters, 1 given
+Cairo\Context::restore() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoContext/save.phpt b/tests/CairoContext/save.phpt
index 9828832d..f33a8f24 100644
--- a/tests/CairoContext/save.phpt
+++ b/tests/CairoContext/save.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->save() method
+Cairo\Context->save() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->save();
@@ -18,13 +18,13 @@ $context->save();
 try {
     $context->save('foo');
     trigger_error('save requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::save() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::save() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/setAntialias.phpt b/tests/CairoContext/setAntialias.phpt
index fe0b49a3..0f1a1b78 100644
--- a/tests/CairoContext/setAntialias.phpt
+++ b/tests/CairoContext/setAntialias.phpt
@@ -1,25 +1,25 @@
 --TEST--
-CairoContext->setAntialias() method
+Cairo\Context->setAntialias() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$context->setAntialias(CairoAntialias::MODE_GRAY);
+$context->setAntialias(Cairo\Antialias::MODE_GRAY);
 var_dump($context->getAntialias());
 
 /* Wrong number args - 1 */
 try {
     $context->setAntialias(1, 1);
     trigger_error('setAntialias requires 0 or 1 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -27,15 +27,15 @@ try {
 try {
     $context->setAntialias(array());
     trigger_error('setAntialias requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(2)
-CairoContext::setAntialias() expects at most 1 parameter, 2 given
-CairoContext::setAntialias() expects parameter 1 to be long, array given
\ No newline at end of file
+long(2)
+Cairo\Context::setAntialias() expects at most 1 parameter, 2 given
+Cairo\Context::setAntialias() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setDash.phpt b/tests/CairoContext/setDash.phpt
index e45826a0..32df3895 100644
--- a/tests/CairoContext/setDash.phpt
+++ b/tests/CairoContext/setDash.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->setDash() method
+Cairo\Context->setDash() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setDash(array(1,2,3));
@@ -19,7 +19,7 @@ var_dump($context->getDash());
 try {
     $context->setDash();
     trigger_error('setDash requires 1-2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -27,7 +27,7 @@ try {
 try {
     $context->setDash(array(), 1, 1);
     trigger_error('setDash requires 1-2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -36,28 +36,28 @@ try {
 try {
     $context->setDash(3);
     trigger_error('setDash requires 1-2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setDash(array('foo'));
     trigger_error('setDash requires 1-2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setDash(array(1), 'foo');
     trigger_error('setDash requires 1-2 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(2) {
   ["dashes"]=>
@@ -72,8 +72,8 @@ array(2) {
   ["offset"]=>
   float(0)
 }
-CairoContext::setDash() expects at least 1 parameter, 0 given
-CairoContext::setDash() expects at most 2 parameters, 3 given
-CairoContext::setDash() expects parameter 1 to be array, integer given
+Cairo\Context::setDash() expects at least 1 parameter, 0 given
+Cairo\Context::setDash() expects at most 2 parameters, 3 given
+Cairo\Context::setDash() expects parameter 1 to be array, int given
 invalid value for a dash setting
-CairoContext::setDash() expects parameter 2 to be double, string given
\ No newline at end of file
+Cairo\Context::setDash() expects parameter 2 to be float, string given
\ No newline at end of file
diff --git a/tests/CairoContext/setFillRule.phpt b/tests/CairoContext/setFillRule.phpt
index fb08e112..f9827936 100644
--- a/tests/CairoContext/setFillRule.phpt
+++ b/tests/CairoContext/setFillRule.phpt
@@ -1,25 +1,25 @@
 --TEST--
-CairoContext->setFillRule() method
+Cairo\Context->setFillRule() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$context->setFillRule(CairoFillRule::EVEN_ODD);
+$context->setFillRule(Cairo\FillRule::EVEN_ODD);
 var_dump($context->getFillRule());
 
 /* Wrong number args - 1 */
 try {
     $context->setFillRule();
     trigger_error('setFillRule requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -27,7 +27,7 @@ try {
 try {
     $context->setFillRule(1, 1);
     trigger_error('setFillRule requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -35,16 +35,16 @@ try {
 try {
     $context->setFillRule(array());
     trigger_error('setFillRule requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(1)
-CairoContext::setFillRule() expects exactly 1 parameter, 0 given
-CairoContext::setFillRule() expects exactly 1 parameter, 2 given
-CairoContext::setFillRule() expects parameter 1 to be long, array given
\ No newline at end of file
+long(1)
+Cairo\Context::setFillRule() expects exactly 1 parameter, 0 given
+Cairo\Context::setFillRule() expects exactly 1 parameter, 2 given
+Cairo\Context::setFillRule() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setLineCap.phpt b/tests/CairoContext/setLineCap.phpt
index 337bc89a..e7a1c926 100644
--- a/tests/CairoContext/setLineCap.phpt
+++ b/tests/CairoContext/setLineCap.phpt
@@ -1,25 +1,25 @@
 --TEST--
-CairoContext->setLineCap() method
+Cairo\Context->setLineCap() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$context->setLineCap(CairoLineCap::SQUARE);
+$context->setLineCap(Cairo\LineCap::SQUARE);
 var_dump($context->getLineCap());
 
 /* Wrong number args - 1 */
 try {
     $context->setLineCap();
     trigger_error('setLineCap requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -27,7 +27,7 @@ try {
 try {
     $context->setLineCap(1, 1);
     trigger_error('setLineCap requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -35,16 +35,16 @@ try {
 try {
     $context->setLineCap(array());
     trigger_error('setLineCap requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(2)
-CairoContext::setLineCap() expects exactly 1 parameter, 0 given
-CairoContext::setLineCap() expects exactly 1 parameter, 2 given
-CairoContext::setLineCap() expects parameter 1 to be long, array given
\ No newline at end of file
+long(2)
+Cairo\Context::setLineCap() expects exactly 1 parameter, 0 given
+Cairo\Context::setLineCap() expects exactly 1 parameter, 2 given
+Cairo\Context::setLineCap() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setLineJoin.phpt b/tests/CairoContext/setLineJoin.phpt
index 0d5439b4..55c8d451 100644
--- a/tests/CairoContext/setLineJoin.phpt
+++ b/tests/CairoContext/setLineJoin.phpt
@@ -1,25 +1,25 @@
 --TEST--
-CairoContext->setLineJoin() method
+Cairo\Context->setLineJoin() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$context->setLineJoin(CairoLineJoin::BEVEL);
+$context->setLineJoin(Cairo\LineJoin::BEVEL);
 var_dump($context->getLineJoin());
 
 /* Wrong number args - 1 */
 try {
     $context->setLineJoin();
     trigger_error('setLineJoin requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -27,7 +27,7 @@ try {
 try {
     $context->setLineJoin(1, 1);
     trigger_error('setLineJoin requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -35,16 +35,16 @@ try {
 try {
     $context->setLineJoin(array());
     trigger_error('setLineJoin requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(2)
-CairoContext::setLineJoin() expects exactly 1 parameter, 0 given
-CairoContext::setLineJoin() expects exactly 1 parameter, 2 given
-CairoContext::setLineJoin() expects parameter 1 to be long, array given
\ No newline at end of file
+long(2)
+Cairo\Context::setLineJoin() expects exactly 1 parameter, 0 given
+Cairo\Context::setLineJoin() expects exactly 1 parameter, 2 given
+Cairo\Context::setLineJoin() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setLineWidth.phpt b/tests/CairoContext/setLineWidth.phpt
index aedaf852..521e9560 100644
--- a/tests/CairoContext/setLineWidth.phpt
+++ b/tests/CairoContext/setLineWidth.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->setLineWidth() method
+Cairo\Context->setLineWidth() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setLineWidth(1);
@@ -18,35 +18,35 @@ var_dump($context->getLineWidth());
 /* wrong params */
 try {
     $context->setLineWidth();
-    trigger_error('CairoContext->setLineWidth() expects 1 param');
+    trigger_error('Cairo\Context->setLineWidth() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 try {
 	$context->setLineWidth(1,1);
-	trigger_error('CairoContext->setLineWidth() expects 1 param');
+	trigger_error('Cairo\Context->setLineWidth() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 /* wrong types */
 try {
     $context->setLineWidth(array());
-    trigger_error('CairoContext->setLineWidth() expects a double');
+    trigger_error('Cairo\Context->setLineWidth() expects a double');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 float(1)
-CairoContext::setLineWidth() expects exactly 1 parameter, 0 given
-CairoContext::setLineWidth() expects exactly 1 parameter, 2 given
-CairoContext::setLineWidth() expects parameter 1 to be double, array given
\ No newline at end of file
+Cairo\Context::setLineWidth() expects exactly 1 parameter, 0 given
+Cairo\Context::setLineWidth() expects exactly 1 parameter, 2 given
+Cairo\Context::setLineWidth() expects parameter 1 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setMiterLimit.phpt b/tests/CairoContext/setMiterLimit.phpt
index bb9e0731..4b86c0c2 100644
--- a/tests/CairoContext/setMiterLimit.phpt
+++ b/tests/CairoContext/setMiterLimit.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->setMiterLimit() method
+Cairo\Context->setMiterLimit() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setMiterLimit(1);
@@ -20,7 +20,7 @@ var_dump($context->getMiterLimit());
 try {
     $context->setMiterLimit();
     trigger_error('setMiterLimit requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -28,7 +28,7 @@ try {
 try {
     $context->setMiterLimit(1, 1);
     trigger_error('setMiterLimit requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -36,17 +36,17 @@ try {
 try {
     $context->setMiterLimit(array());
     trigger_error('setMiterLimit requires double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 float(1)
-CairoContext::setMiterLimit() expects exactly 1 parameter, 0 given
-CairoContext::setMiterLimit() expects exactly 1 parameter, 2 given
-CairoContext::setMiterLimit() expects parameter 1 to be double, array given
\ No newline at end of file
+Cairo\Context::setMiterLimit() expects exactly 1 parameter, 0 given
+Cairo\Context::setMiterLimit() expects exactly 1 parameter, 2 given
+Cairo\Context::setMiterLimit() expects parameter 1 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setOperator.phpt b/tests/CairoContext/setOperator.phpt
index 674c2951..035ec1e6 100644
--- a/tests/CairoContext/setOperator.phpt
+++ b/tests/CairoContext/setOperator.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->setOperator() method
+Cairo\Context->setOperator() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setOperator(CAIRO_FORMAT_ARGB32);
@@ -19,35 +19,35 @@ var_dump($context->getOperator());
 /* wrong params */
 try {
 	$context->setOperator();
-	trigger_error('CairoContext->setOperator() expects 1 param');
+	trigger_error('Cairo\Context->setOperator() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 try {
 	$context->setOperator(CAIRO_FORMAT_ARGB32, 1);
-	trigger_error('CairoContext->setOperator() expects 1 param');
+	trigger_error('Cairo\Context->setOperator() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 /* wrong type */
 try {
 	$context->setOperator(array());
-	trigger_error('CairoContext->setOperator() expects 1 param');
+	trigger_error('Cairo\Context->setOperator() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
-CairoContext::setOperator() expects exactly 1 parameter, 0 given
-CairoContext::setOperator() expects exactly 1 parameter, 2 given
-CairoContext::setOperator() expects parameter 1 to be long, array given
\ No newline at end of file
+long(0)
+Cairo\Context::setOperator() expects exactly 1 parameter, 0 given
+Cairo\Context::setOperator() expects exactly 1 parameter, 2 given
+Cairo\Context::setOperator() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setSource.phpt b/tests/CairoContext/setSource.phpt
index 2d62dbca..de8d29d1 100644
--- a/tests/CairoContext/setSource.phpt
+++ b/tests/CairoContext/setSource.phpt
@@ -1,25 +1,25 @@
 --TEST--
-CairoContext->setSource() method
+Cairo\Context->setSource() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$pattern = new CairoSolidPattern(0.3, 0.3, 0.3);
+$pattern = new Cairo\Pattern\Solid(0.3, 0.3, 0.3);
 var_dump($pattern);
 
 $context->setSource($pattern);
 
 var_dump($context->getSource()->getRGBA());
 
-$pattern = new CairoSolidPattern(0.3, 0.3, 0.3);
+$pattern = new Cairo\Pattern\Solid(0.3, 0.3, 0.3);
 var_dump($pattern);
 
 $context->setSource($pattern);
@@ -30,7 +30,7 @@ var_dump($context->getSource()->getRGBA());
 try {
     $context->setSource();
     trigger_error('setSource requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -38,7 +38,7 @@ try {
 try {
     $context->setSource($pattern, 1);
     trigger_error('setSource requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -46,7 +46,7 @@ try {
 try {
     $context->setSource(array());
     trigger_error('setSource expects instanceof CairoPattern');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -54,11 +54,11 @@ try {
 die;
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoSolidPattern)#%d (0) {
+object(Cairo\Pattern\Solid)#%d (0) {
 }
 array(4) {
   ["red"]=>
@@ -70,7 +70,7 @@ array(4) {
   ["alpha"]=>
   float(1)
 }
-object(CairoSolidPattern)#%d (0) {
+object(Cairo\Pattern\Solid)#%d (0) {
 }
 array(4) {
   ["red"]=>
@@ -82,6 +82,6 @@ array(4) {
   ["alpha"]=>
   float(1)
 }
-CairoContext::setSource() expects exactly 1 parameter, 0 given
-CairoContext::setSource() expects exactly 1 parameter, 2 given
-CairoContext::setSource() expects parameter 1 to be CairoPattern, array given
+Cairo\Context::setSource() expects exactly 1 parameter, 0 given
+Cairo\Context::setSource() expects exactly 1 parameter, 2 given
+Cairo\Context::setSource() expects parameter 1 to be CairoPattern, array given
diff --git a/tests/CairoContext/setSourceRGB.phpt b/tests/CairoContext/setSourceRGB.phpt
index 3cbabb4a..f96632ec 100644
--- a/tests/CairoContext/setSourceRGB.phpt
+++ b/tests/CairoContext/setSourceRGB.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->setSourceRGB() method
+Cairo\Context->setSourceRGB() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setSourceRGB(0.1, 0.1, 0.1);
@@ -19,7 +19,7 @@ try {
     $context->setSourceRGB();
     trigger_error('setSourceRGB needs 3!');
 } 
-catch(CairoException $ex) {
+catch(TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -27,7 +27,7 @@ try {
     $context->setSourceRGB(1);
     trigger_error('setSourceRGB needs 3!');
 }
-catch(CairoException $ex) {
+catch(TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -35,7 +35,7 @@ try {
     $context->setSourceRGB(1, 1);
     trigger_error('setSourceRGB needs 3!');
 } 
-catch(CairoException $ex) {
+catch(TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -43,7 +43,7 @@ try {
     $context->setSourceRGB(1, 1, 1, 1);
     trigger_error('setSourceRGB needs 3!');
 } 
-catch(CairoException $ex) {
+catch(TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
@@ -51,33 +51,33 @@ catch(CairoException $ex) {
 try {
     $context->setSourceRGB(array(), 1, 1);
 }
-catch(CairoException $ex) {
+catch(TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setSourceRGB(1, array(), 1);
 } 
-catch(CairoException $ex) {
+catch(TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 
 try {
     $context->setSourceRGB(1, 1, array());
 } 
-catch(CairoException $ex) {
+catch(TypeError $ex) {
     echo $ex->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::setSourceRGB() expects exactly 3 parameters, 0 given
-CairoContext::setSourceRGB() expects exactly 3 parameters, 1 given
-CairoContext::setSourceRGB() expects exactly 3 parameters, 2 given
-CairoContext::setSourceRGB() expects exactly 3 parameters, 4 given
-CairoContext::setSourceRGB() expects parameter 1 to be double, array given
-CairoContext::setSourceRGB() expects parameter 2 to be double, array given
-CairoContext::setSourceRGB() expects parameter 3 to be double, array given
\ No newline at end of file
+Cairo\Context::setSourceRGB() expects exactly 3 parameters, 0 given
+Cairo\Context::setSourceRGB() expects exactly 3 parameters, 1 given
+Cairo\Context::setSourceRGB() expects exactly 3 parameters, 2 given
+Cairo\Context::setSourceRGB() expects exactly 3 parameters, 4 given
+Cairo\Context::setSourceRGB() expects parameter 1 to be float, array given
+Cairo\Context::setSourceRGB() expects parameter 2 to be float, array given
+Cairo\Context::setSourceRGB() expects parameter 3 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoContext/setSourceRGBA.phpt b/tests/CairoContext/setSourceRGBA.phpt
index ea1a6af0..3b2d77ed 100644
--- a/tests/CairoContext/setSourceRGBA.phpt
+++ b/tests/CairoContext/setSourceRGBA.phpt
@@ -1,41 +1,41 @@
 --TEST--
-CairoContext->setSourceRGBA() method
+Cairo\Context->setSourceRGBA() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setSourceRGBA(0.1, 0.1, 0.1, 0.5);
 
 try {
     $context->setSourceRGBA("1", "1", "1", "0");
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 
 try {
     $context->setSourceRGBA("1.0", "1.0", "1.0", "0.0");
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 
 try {
     $context->setSourceRGBA("foo", "bar", "baz", "foo");
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::setSourceRGBA() expects parameter 1 to be double, string given
+Cairo\Context::setSourceRGBA() expects parameter 1 to be float, string given
diff --git a/tests/CairoContext/setSourceSurface.phpt b/tests/CairoContext/setSourceSurface.phpt
index 7ac8bdd0..04e35aa7 100644
--- a/tests/CairoContext/setSourceSurface.phpt
+++ b/tests/CairoContext/setSourceSurface.phpt
@@ -1,23 +1,23 @@
 --TEST--
-CairoContext->setSourceSurface() method
+Cairo\Context->setSourceSurface() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
-$pattern = new CairoSolidPattern(0.3, 0.3, 0.3);
+$pattern = new Cairo\Pattern\Solid(0.3, 0.3, 0.3);
 var_dump($pattern);
 
 $context->setSource($pattern);
 
-$surface2 = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+$surface2 = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
 var_dump($surface2);
 
 $context->setSourceSurface($surface2, 5, 5);
@@ -27,7 +27,7 @@ var_dump($context);
 try {
     $context->setSourceSurface();
     trigger_error('setSourceSurface requires at leastone arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -35,7 +35,7 @@ try {
 try {
     $context->setSourceSurface($surface2, 1, 1, 1);
     trigger_error('setSourceSurface requires no more than 3 args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -43,7 +43,7 @@ try {
 try {
     $context->setSourceSurface(array());
     trigger_error('setSourceSurface expects instanceof CairoPattern');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -51,7 +51,7 @@ try {
 try {
     $context->setSourceSurface($surface2, array());
     trigger_error('setSourceSurface expects instanceof CairoPattern');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -59,23 +59,23 @@ try {
 try {
     $context->setSourceSurface($surface2, 1, array());
     trigger_error('setSourceSurface expects double');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-object(CairoSolidPattern)#%d (0) {
+object(Cairo\Pattern\Solid)#%d (0) {
 }
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::setSourceSurface() expects at least 1 parameter, 0 given
-CairoContext::setSourceSurface() expects at most 3 parameters, 4 given
-CairoContext::setSourceSurface() expects parameter 1 to be CairoSurface, array given
-CairoContext::setSourceSurface() expects parameter 2 to be double, array given
-CairoContext::setSourceSurface() expects parameter 3 to be double, array given
+Cairo\Context::setSourceSurface() expects at least 1 parameter, 0 given
+Cairo\Context::setSourceSurface() expects at most 3 parameters, 4 given
+Cairo\Context::setSourceSurface() expects parameter 1 to be Cairo\Surface, array given
+Cairo\Context::setSourceSurface() expects parameter 2 to be float, array given
+Cairo\Context::setSourceSurface() expects parameter 3 to be float, array given
diff --git a/tests/CairoContext/setTolerance.phpt b/tests/CairoContext/setTolerance.phpt
index 1bc308d2..99d32e2e 100644
--- a/tests/CairoContext/setTolerance.phpt
+++ b/tests/CairoContext/setTolerance.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->setTolerance() method
+Cairo\Context->setTolerance() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->setTolerance(1);
@@ -19,35 +19,99 @@ var_dump($context->getOperator());
 /* wrong params */
 try {
 	$context->setTolerance();
-	trigger_error('CairoContext->setTolerance() expects 1 param');
+	trigger_error('Cairo\Context->setTolerance() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 try {
 	$context->setOperator(1, 1);
-	trigger_error('CairoContext->setTolerance() expects 1 param');
+	trigger_error('Cairo\Context->setTolerance() expects 1 param');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 /* wrong type */
 try {
 	$context->setOperator(array());
-	trigger_error('CairoContext->setTolerance() expects param 1 to be double');
+	trigger_error('Cairo\Context->setTolerance() expects param 1 to be float');
 } 
-catch (CairoException $ex) {
+catch (TypeError $ex) {
 	echo $ex->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECTF--
-object(CairoImageSurface)#1 (0) {
+object(Cairo\Surface\Image)#1 (0) {
 }
-object(CairoContext)#2 (0) {
+object(Cairo\Context)#2 (0) {
 }
-int(2)
-CairoContext::setTolerance() expects exactly 1 parameter, 0 given
-CairoContext::setOperator() expects exactly 1 parameter, 2 given
-CairoContext::setOperator() expects parameter 1 to be long, array given
\ No newline at end of file
+object(Cairo\Operator)#3 (2) {
+  ["__elements"]=>
+  array(29) {
+    ["CLEAR"]=>
+    int(0)
+    ["SOURCE"]=>
+    int(1)
+    ["OVER"]=>
+    int(2)
+    ["IN"]=>
+    int(3)
+    ["OUT"]=>
+    int(4)
+    ["ATOP"]=>
+    int(5)
+    ["DEST"]=>
+    int(6)
+    ["DEST_OVER"]=>
+    int(7)
+    ["DEST_IN"]=>
+    int(8)
+    ["DEST_OUT"]=>
+    int(9)
+    ["DEST_ATOP"]=>
+    int(10)
+    ["XOR"]=>
+    int(11)
+    ["ADD"]=>
+    int(12)
+    ["SATURATE"]=>
+    int(13)
+    ["MULTIPLY"]=>
+    int(14)
+    ["SCREEN"]=>
+    int(15)
+    ["OVERLAY"]=>
+    int(16)
+    ["DARKEN"]=>
+    int(17)
+    ["LIGHTEN"]=>
+    int(18)
+    ["COLOR_DODGE"]=>
+    int(19)
+    ["COLOR_BURN"]=>
+    int(20)
+    ["HARD_LIGHT"]=>
+    int(21)
+    ["SOFT_LIGHT"]=>
+    int(22)
+    ["DIFFERENCE"]=>
+    int(23)
+    ["EXCLUSION"]=>
+    int(24)
+    ["HSL_HUE"]=>
+    int(25)
+    ["HSL_SATURATION"]=>
+    int(26)
+    ["HSL_COLOR"]=>
+    int(27)
+    ["HSL_LUMINOSITY"]=>
+    int(28)
+  }
+  ["__value"]=>
+  int(2)
+}
+Cairo\Context::setTolerance() expects exactly 1 parameter, 0 given
+Cairo\Context::setOperator() expects exactly 1 parameter, 2 given
+Cairo\Context::setOperator() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoContext/showPage.phpt b/tests/CairoContext/showPage.phpt
index fff58423..251f25ca 100644
--- a/tests/CairoContext/showPage.phpt
+++ b/tests/CairoContext/showPage.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->showPage() method
+Cairo\Context->showPage() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->showPage();
@@ -18,13 +18,13 @@ $context->showPage();
 try {
     $context->showPage('foobar');
     trigger_error('showPage requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::showPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::showPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/status.phpt b/tests/CairoContext/status.phpt
index 85009dad..5575348d 100644
--- a/tests/CairoContext/status.phpt
+++ b/tests/CairoContext/status.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->status() method
+Cairo\Context->status() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $status = $context->status();
@@ -21,15 +21,15 @@ var_dump($status == CairoStatus::SUCCESS);
 try {
     $context->status('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-int(0)
+long(0)
 bool(true)
-CairoContext::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/stroke.phpt b/tests/CairoContext/stroke.phpt
index f69edf8f..ef243092 100644
--- a/tests/CairoContext/stroke.phpt
+++ b/tests/CairoContext/stroke.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->stroke() method
+Cairo\Context->stroke() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->stroke();
@@ -18,13 +18,13 @@ $context->stroke();
 try {
     $context->stroke('foobar');
     trigger_error('stroke requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::stroke() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::stroke() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/strokeExtents.phpt b/tests/CairoContext/strokeExtents.phpt
index 9a789c21..283ad91e 100644
--- a/tests/CairoContext/strokeExtents.phpt
+++ b/tests/CairoContext/strokeExtents.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->strokeExtents() method
+Cairo\Context->strokeExtents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 var_dump($context->strokeExtents());
@@ -18,14 +18,14 @@ var_dump($context->strokeExtents());
 try {
     $context->strokeExtents('foobar');
     trigger_error('strokeExtents requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
 array(4) {
   [0]=>
@@ -37,4 +37,4 @@ array(4) {
   [3]=>
   float(0)
 }
-CairoContext::strokeExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::strokeExtents() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoContext/strokePreserve.phpt b/tests/CairoContext/strokePreserve.phpt
index 5ae7118b..fb77bb19 100644
--- a/tests/CairoContext/strokePreserve.phpt
+++ b/tests/CairoContext/strokePreserve.phpt
@@ -1,15 +1,15 @@
 --TEST--
-CairoContext->strokePreserve() method
+Cairo\Context->strokePreserve() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$context = new CairoContext($surface);
+$context = new Cairo\Context($surface);
 var_dump($context);
 
 $context->strokePreserve();
@@ -18,13 +18,13 @@ $context->strokePreserve();
 try {
     $context->strokePreserve('foobar');
     trigger_error('strokePreserve requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoContext)#%d (0) {
+object(Cairo\Context)#%d (0) {
 }
-CairoContext::strokePreserve() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Context::strokePreserve() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontFace/CairoFontSlant_constants.phpt b/tests/CairoFontFace/CairoFontSlant_constants.phpt
index f9b008c1..3ff78424 100644
--- a/tests/CairoFontFace/CairoFontSlant_constants.phpt
+++ b/tests/CairoFontFace/CairoFontSlant_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoFontSlant class constants
+Cairo\FontSlant class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -13,9 +13,9 @@ $constants = array(
 	);
 $error = false;
 foreach($constants as $name) {
-	if (!defined('CairoFontSlant::' . $name)) {
+	if (!defined('Cairo\FontSlant::' . $name)) {
 		$error = true;
-		echo 'Missing Constant: CairoFontSlant::' . $name . "\n";
+		echo 'Missing Constant: Cairo\FontSlant::' . $name . "\n";
 	}
 }
 if (!$error) {
diff --git a/tests/CairoFontFace/CairoFontWeight_constants.phpt b/tests/CairoFontFace/CairoFontWeight_constants.phpt
index 41e8cdbc..8a036ac3 100644
--- a/tests/CairoFontFace/CairoFontWeight_constants.phpt
+++ b/tests/CairoFontFace/CairoFontWeight_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoFontWeight class constants
+Cairo\FontWeight class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -13,9 +13,9 @@ $constants = array(
 
 $error = false;
 foreach($constants as $name) {
-	if (!defined('CairoFontWeight::' . $name)) {
+	if (!defined('Cairo\FontWeight::' . $name)) {
 		$error = true;
-		echo 'Missing Constant: CairoFontWeight::' . $name . "\n";
+		echo 'Missing Constant: Cairo\FontWeight::' . $name . "\n";
 	}
 }
 
diff --git a/tests/CairoFontFace/CairoFtFontFace/__construct.phpt b/tests/CairoFontFace/CairoFtFontFace/__construct.phpt
index 15bd1a55..8251512e 100644
--- a/tests/CairoFontFace/CairoFtFontFace/__construct.phpt
+++ b/tests/CairoFontFace/CairoFtFontFace/__construct.phpt
@@ -20,7 +20,7 @@ var_dump($c);
 // We shouldn't accept 0 args
 try {
     $c = new CairoFtFontFace();
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     var_dump($e->getMessage());
 }
 var_dump($c);
@@ -28,7 +28,7 @@ var_dump($c);
 // Test with 1 param
 try {
     $c = new CairoFtFontFace("NotARealFont");
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     var_dump($e->getMessage());
 }
 var_dump($c);
@@ -36,7 +36,7 @@ var_dump($c);
 // Test with a silly param
 try {
     $c = new CairoFtFontFace(array());
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     var_dump($e->getMessage());
 }
 var_dump($c); 
@@ -44,7 +44,7 @@ var_dump($c);
 // Test with a broken font
 try {
     $c = new CairoFtFontFace(dirname(__FILE__) . '/broken.ttf');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     var_dump($e->getMessage());
 }
 var_dump($c);
diff --git a/tests/CairoFontFace/CairoFtFontFace/cairo_ft_font_face_create.phpt b/tests/CairoFontFace/CairoFtFontFace/cairo_ft_font_face_create.phpt
deleted file mode 100644
index f745afb1..00000000
--- a/tests/CairoFontFace/CairoFtFontFace/cairo_ft_font_face_create.phpt
+++ /dev/null
@@ -1,52 +0,0 @@
---TEST--
-cairo_ft_font_face_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_ft_font_face_create')) die('skip - cairo_ft_font_face_create not available');
-?>
---FILE--
-<?php
-$fontFile = dirname(__FILE__) . "/Vera.ttf";
-
-// Test with 1 param
-$c = cairo_ft_font_face_create($fontFile);
-var_dump($c);
-
-// test with 2 params
-$c = cairo_ft_font_face_create($fontFile, 0);
-var_dump($c);
-
-// We shouldn't accept 0 args
-$c = cairo_ft_font_face_create();
-var_dump($c);
-
-// Test with 1 param
-$c = cairo_ft_font_face_create("NotARealFont");
-var_dump($c);
-
-// Test with a silly param
-$c = cairo_ft_font_face_create(array());
-var_dump($c); 
-
-// Test with a broken font
-$c = cairo_ft_font_face_create(dirname(__FILE__) . '/broken.ttf');
-var_dump($c);
-?>
---EXPECTF--
-object(CairoFtFontFace)#1 (0) {
-}
-object(CairoFtFontFace)#2 (0) {
-}
-
-Warning: cairo_ft_font_face_create() expects at least 1 parameter, 0 given in %s on line 13
-NULL
-
-Warning: cairo_ft_font_face_create(NotARealFont): failed to open stream: No such file or directory in %s on line 17
-NULL
-
-Warning: cairo_ft_font_face_create expects parameter 1 to be a string or a stream resource in %s on line 21
-NULL
-
-Warning: cairo_ft_font_face_create(): An error occurred opening the file: %s in %s on line 25
-NULL
diff --git a/tests/CairoFontFace/CairoToyFontFace/__construct.phpt b/tests/CairoFontFace/CairoToyFontFace/__construct.phpt
index ad0d8e67..c1714c79 100644
--- a/tests/CairoFontFace/CairoToyFontFace/__construct.phpt
+++ b/tests/CairoFontFace/CairoToyFontFace/__construct.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoToyFontFace::__construct() method
+Cairo\FontFace\Toy::__construct() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,56 +7,56 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 --FILE--
 <?php
 // Test with all parameters
-$c = new CairoToyFontFace("sans-serif", CairoFontSlant::NORMAL, CairoFontWeight::NORMAL);
+$c = new Cairo\FontFace\Toy("sans-serif", Cairo\FontSlant::NORMAL, Cairo\FontWeight::NORMAL);
 var_dump($c);
 
 // Test with 1 param
-$c = new CairoToyFontFace("sans-serif");
+$c = new Cairo\FontFace\Toy("sans-serif");
 var_dump($c);
 
 // test with 2 params
-$c = new CairoToyFontFace("sans-serif", CairoFontSlant::NORMAL);
+$c = new Cairo\FontFace\Toy("sans-serif", Cairo\FontSlant::NORMAL);
 var_dump($c);
 
 // test with 3 params, 1 null
-$c = new CairoToyFontFace("sans-serif", null, CairoFontWeight::NORMAL);
+$c = new Cairo\FontFace\Toy("sans-serif", null, Cairo\FontWeight::NORMAL);
 var_dump($c);
 
 // We shouldn't accept 0 args
 try {
-    $c = new CairoToyFontFace();
-} catch (CairoException $e) {
+    $c = new Cairo\FontFace\Toy();
+} catch (TypeError $e) {
     var_dump($e->getMessage());
 }
 var_dump($c);
 
 // Test with 1 param
-$c = new CairoToyFontFace("NotARealFont");
+$c = new Cairo\FontFace\Toy("NotARealFont");
 var_dump($c);
 
 // Test with a silly param
 $o = array();
 try {
-    $c = new CairoToyFontFace($o);
-} catch (CairoException $e) {
+    $c = new Cairo\FontFace\Toy($o);
+} catch (TypeError $e) {
     var_dump($e->getMessage());
 }
 var_dump($c);
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-string(69) "CairoToyFontFace::__construct() expects at least 1 parameter, 0 given"
-object(CairoToyFontFace)#2 (0) {
+string(69) "Cairo\FontFace\Toy::__construct() expects at least 1 parameter, 0 given"
+object(Cairo\FontFace\Toy)#2 (0) {
 }
-object(CairoToyFontFace)#1 (0) {
+object(Cairo\FontFace\Toy)#1 (0) {
 }
-string(77) "CairoToyFontFace::__construct() expects parameter 1 to be string, array given"
-object(CairoToyFontFace)#1 (0) {
+string(77) "Cairo\FontFace\Toy::__construct() expects parameter 1 to be string, array given"
+object(Cairo\FontFace\Toy)#1 (0) {
 }
diff --git a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_create.phpt b/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_create.phpt
deleted file mode 100644
index c01b9bc8..00000000
--- a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_create.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-cairo_toy_font_face_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_toy_font_face_create')) die('skip - cairo_toy_font_face_create not available');
-?>
---FILE--
-<?php
-// Test with all parameters
-$c = cairo_toy_font_face_create("sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-var_dump($c);
-
-// Test with 1 param
-$c = cairo_toy_font_face_create("sans-serif");
-var_dump($c);
-
-// test with 2 params
-$c = cairo_toy_font_face_create("sans-serif", CAIRO_FONT_SLANT_NORMAL);
-var_dump($c);
-
-// test with 3 params, 1 null
-$c = cairo_toy_font_face_create("sans-serif", null, CAIRO_FONT_WEIGHT_NORMAL);
-var_dump($c);
-
-// We shouldn't accept 0 args
-$c = cairo_toy_font_face_create();
-var_dump($c);
-
-// Test with 1 param
-$c = cairo_toy_font_face_create("NotARealFont");
-var_dump($c);
-
-// Test with a silly param
-$c = cairo_toy_font_face_create(array());
-var_dump($c);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-
-Warning: cairo_toy_font_face_create() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-object(CairoToyFontFace)#2 (0) {
-}
-
-Warning: cairo_toy_font_face_create() expects parameter 1 to be string, array given in %s on line %d
-NULL
diff --git a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_family.phpt b/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_family.phpt
deleted file mode 100644
index c1e51326..00000000
--- a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_family.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-cairo_font_face_get_family function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!class_exists('CairoToyFontFace')) die('skip - CairoToyFontFace not enabled');
-?>
---FILE--
-<?php
-// Test with all parameters
-$c = cairo_toy_font_face_create("sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-var_dump(cairo_toy_font_face_get_family($c));
-
-// Set up handler for catchable errors
-function catch_error($errno, $errstr) {
-    echo 'CAUGHT ERROR: ' . $errstr . PHP_EOL;
-}
-set_error_handler('catch_error', E_RECOVERABLE_ERROR);
-
-// Test with a different class
-var_dump(cairo_toy_font_face_get_family(new stdClass));
-
-// Test with a non-object
-var_dump(cairo_toy_font_face_get_family("Foo"));
-?>
---EXPECTF--
-string(10) "sans-serif"
-CAUGHT ERROR: Argument 1 passed to cairo_toy_font_face_get_family() must be an instance of CairoToyFontFace, instance of stdClass given
-
-Warning: cairo_toy_font_face_get_family() expects parameter 1 to be CairoToyFontFace, object given in %s on line %d
-NULL
-CAUGHT ERROR: Argument 1 passed to cairo_toy_font_face_get_family() must be an instance of CairoToyFontFace, string given
-
-Warning: cairo_toy_font_face_get_family() expects parameter 1 to be CairoToyFontFace, string given in %s on line %d
-NULL
- 
diff --git a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_slant.phpt b/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_slant.phpt
deleted file mode 100644
index 560748d6..00000000
--- a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_slant.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-cairo_toy_font_face_get_slant function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!class_exists('CairoToyFontFace')) die('skip - CairoToyFontFace not enabled');
-?>
---FILE--
-<?php
-$c = cairo_toy_font_face_create("sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-var_dump(cairo_toy_font_face_get_slant($c));
-
-$c = cairo_toy_font_face_create("sans-serif", CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_NORMAL);
-var_dump(cairo_toy_font_face_get_slant($c));
-
-// Set up handler for catchable errors
-function catch_error($errno, $errstr) {
-    echo 'CAUGHT ERROR: ' . $errstr . PHP_EOL;
-}
-set_error_handler('catch_error', E_RECOVERABLE_ERROR);
-
-// Test with a different class
-var_dump(cairo_toy_font_face_get_slant(new stdClass));
-
-// Test with a non-object
-var_dump(cairo_toy_font_face_get_slant("Foo"));
-?>
---EXPECTF--
-int(0)
-int(1)
-CAUGHT ERROR: Argument 1 passed to cairo_toy_font_face_get_slant() must be an instance of CairoToyFontFace, instance of stdClass given
-
-Warning: cairo_toy_font_face_get_slant() expects parameter 1 to be CairoToyFontFace, object given in %s on line %d
-NULL
-CAUGHT ERROR: Argument 1 passed to cairo_toy_font_face_get_slant() must be an instance of CairoToyFontFace, string given
-
-Warning: cairo_toy_font_face_get_slant() expects parameter 1 to be CairoToyFontFace, string given in %s on line %d
-NULL
diff --git a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_weight.phpt b/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_weight.phpt
deleted file mode 100644
index 359e5c40..00000000
--- a/tests/CairoFontFace/CairoToyFontFace/cairo_toy_font_face_get_weight.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-cairo_toy_font_face_get_weight function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!class_exists('CairoToyFontFace')) die('skip - CairoToyFontFace not enabled');
-?>
---FILE--
-<?php
-$c = cairo_toy_font_face_create("sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-var_dump(cairo_toy_font_face_get_weight($c));
-
-$c = cairo_toy_font_face_create("sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
-var_dump(cairo_toy_font_face_get_weight($c));
-
-// Set up handler for catchable errors
-function catch_error($errno, $errstr) {
-    echo 'CAUGHT ERROR: ' . $errstr . PHP_EOL;
-}
-set_error_handler('catch_error', E_RECOVERABLE_ERROR);
-
-// Test with a different class
-var_dump(cairo_toy_font_face_get_weight(new stdClass));
-
-// Test with a non-object
-var_dump(cairo_toy_font_face_get_weight("Foo"));
-?>
---EXPECTF--
-int(0)
-int(1)
-CAUGHT ERROR: Argument 1 passed to cairo_toy_font_face_get_weight() must be an instance of CairoToyFontFace, instance of stdClass given
-
-Warning: cairo_toy_font_face_get_weight() expects parameter 1 to be CairoToyFontFace, object given in %s on line %d
-NULL
-CAUGHT ERROR: Argument 1 passed to cairo_toy_font_face_get_weight() must be an instance of CairoToyFontFace, string given
-
-Warning: cairo_toy_font_face_get_weight() expects parameter 1 to be CairoToyFontFace, string given in %s on line %d
-NULL
diff --git a/tests/CairoFontFace/CairoToyFontFace/getFamily.phpt b/tests/CairoFontFace/CairoToyFontFace/getFamily.phpt
index 2e6fe167..b25b318c 100644
--- a/tests/CairoFontFace/CairoToyFontFace/getFamily.phpt
+++ b/tests/CairoFontFace/CairoToyFontFace/getFamily.phpt
@@ -1,14 +1,14 @@
 --TEST--
-CairoToyFontFace::getFamily() method
+Cairo\FontFace\Toy::getFamily() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!class_exists('CairoToyFontFace')) die('skip - CairoToyFontFace not enabled');
+if(!class_exists('Cairo\FontFace\Toy')) die('skip - Cairo\FontFace\Toy not enabled');
 ?>
 --FILE--
 <?php
 // Test with all parameters
-$c = new CairoToyFontFace("sans-serif", CairoFontSlant::NORMAL, CairoFontWeight::NORMAL);
+$c = new Cairo\FontFace\Toy("sans-serif", Cairo\FontSlant::NORMAL, Cairo\FontWeight::NORMAL);
 var_dump($c->getFamily());
 ?>
 --EXPECTF--
diff --git a/tests/CairoFontFace/CairoToyFontFace/getSlant.phpt b/tests/CairoFontFace/CairoToyFontFace/getSlant.phpt
index 292cbb6a..52214055 100644
--- a/tests/CairoFontFace/CairoToyFontFace/getSlant.phpt
+++ b/tests/CairoFontFace/CairoToyFontFace/getSlant.phpt
@@ -1,19 +1,19 @@
 --TEST--
-CairoToyFontFace::getSlant() method
+Cairo\FontFace\Toy::getSlant() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!class_exists('CairoToyFontFace')) die('skip - CairoToyFontFace not enabled');
+if(!class_exists('Cairo\FontFace\Toy')) die('skip - Cairo\FontFace\Toy not enabled');
 ?>
 --FILE--
 <?php
 // Test with all parameters
-$c = new CairoToyFontFace("sans-serif", CairoFontSlant::NORMAL, CairoFontWeight::NORMAL);
+$c = new Cairo\FontFace\Toy("sans-serif", Cairo\FontSlant::NORMAL, Cairo\FontWeight::NORMAL);
 var_dump($c->getSlant());
 
-$c = new CairoToyFontFace("sans-serif", CairoFontSlant::ITALIC, CairoFontWeight::NORMAL);
+$c = new Cairo\FontFace\Toy("sans-serif", Cairo\FontSlant::ITALIC, Cairo\FontWeight::NORMAL);
 var_dump($c->getSlant());
 ?>
 --EXPECTF--
-int(0)
-int(1)
+long(0)
+long(1)
diff --git a/tests/CairoFontFace/CairoToyFontFace/getWeight.phpt b/tests/CairoFontFace/CairoToyFontFace/getWeight.phpt
index 8dd98ff4..7016db42 100644
--- a/tests/CairoFontFace/CairoToyFontFace/getWeight.phpt
+++ b/tests/CairoFontFace/CairoToyFontFace/getWeight.phpt
@@ -1,19 +1,19 @@
 --TEST--
-CairoToyFontFace::getWeight() method
+Cairo\FontFace\Toy::getWeight() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!class_exists('CairoToyFontFace')) die('skip - CairoToyFontFace not enabled');
+if(!class_exists('Cairo\FontFace\Toy')) die('skip - Cairo\FontFace\Toy not enabled');
 ?>
 --FILE--
 <?php
 // Test with all parameters
-$c = new CairoToyFontFace("sans-serif", CairoFontWeight::NORMAL, CairoFontWeight::NORMAL);
+$c = new Cairo\FontFace\Toy("sans-serif", Cairo\FontWeight::NORMAL, Cairo\FontWeight::NORMAL);
 var_dump($c->getWeight());
 
-$c = new CairoToyFontFace("sans-serif", CairoFontWeight::NORMAL, CairoFontWeight::BOLD);
+$c = new Cairo\FontFace\Toy("sans-serif", Cairo\FontWeight::NORMAL, Cairo\FontWeight::BOLD);
 var_dump($c->getWeight());
 ?>
 --EXPECTF--
-int(0)
-int(1)
+long(0)
+long(1)
diff --git a/tests/CairoFontFace/CairoWin32FontFace/__construct.phpt b/tests/CairoFontFace/CairoWin32FontFace/__construct.phpt
index 91eea73a..1b9cda8d 100644
--- a/tests/CairoFontFace/CairoWin32FontFace/__construct.phpt
+++ b/tests/CairoFontFace/CairoWin32FontFace/__construct.phpt
@@ -25,14 +25,14 @@ var_dump($f);
 // Test with incorrect param
 try {
 	$f = new CairoWin32FontFace('not an array');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage(), PHP_EOL;
 }
 
 // Test with too many params
 try {
 	$f = new CairoWin32FontFace($f_opts, '2nd param');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage(), PHP_EOL;
 }
 ?>
diff --git a/tests/CairoFontFace/CairoWin32FontFace/cairo_win32_font_face_create.phpt b/tests/CairoFontFace/CairoWin32FontFace/cairo_win32_font_face_create.phpt
deleted file mode 100644
index 1880f6b0..00000000
--- a/tests/CairoFontFace/CairoWin32FontFace/cairo_win32_font_face_create.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-cairo_win32_font_face_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo'))
-	die('skip - Cairo extension not available');
-if(!function_exists('cairo_win32_font_face_create'))
-	die('skip - cairo_win32_font_face_create not available');
-?>
---FILE--
-<?php
-$f_opts = array(
-	'lfFaceName' => 'Impact',
-	'lfWeight' => CairoWin32FontWeight::BOLD
-);
-
-$font_face = cairo_win32_font_face_create();
-var_dump($font_face);
-
-$font_face = cairo_win32_font_face_create($f_opts);
-var_dump($font_face);
-
-$font_face = cairo_win32_font_face_create(1);
-var_dump($font_face);
-
-$font_face = cairo_win32_font_face_create($f_opts, 1);
-var_dump($font_face);
-
-?>
---EXPECTF--
-object(CairoWin32FontFace)#%d (0) {
-}
-object(CairoWin32FontFace)#%d (0) {
-}
-
-Warning: cairo_win32_font_face_create() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: cairo_win32_font_face_create() expects at most 1 parameter, 2 given in %s on line %d
-NULL
\ No newline at end of file
diff --git a/tests/CairoFontFace/__construct.phpt b/tests/CairoFontFace/__construct.phpt
index fe8b3464..5d0a50e5 100644
--- a/tests/CairoFontFace/__construct.phpt
+++ b/tests/CairoFontFace/__construct.phpt
@@ -1,20 +1,20 @@
 --TEST--
-new CairoFontFace [ __construct method ]
+new Cairo\FontFace [ __construct method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-class test extends CairoFontFace {}
+class test extends Cairo\FontFace {}
 
-class test2 extends CairoFontFace {
+class test2 extends Cairo\FontFace {
 	public function __construct() {}
 }
 try {
 	$pattern = new test();
 	echo 'Attempting to use constructor should throw an exception';
-} catch (CairoException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage();
 }
 
@@ -23,5 +23,5 @@ $pattern->getType();
 echo 'First call to any method should throw a fatal error';
 ?>
 --EXPECTF--
-CairoFontFace cannot be constructed
+Cairo\FontFace cannot be constructed
 Fatal error: Internal font face object missing in test2 wrapper, you must call parent::__construct in extended classes in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontFace/cairo_font_face_get_type.phpt b/tests/CairoFontFace/cairo_font_face_get_type.phpt
deleted file mode 100644
index a26e3f93..00000000
--- a/tests/CairoFontFace/cairo_font_face_get_type.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-cairo_font_face_get_type() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-var_dump(cairo_font_face_get_type($fontface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// requires exactly 1 arg
-cairo_font_face_get_type();
-cairo_font_face_get_type($fontface);
-
-// arg type is CairoFontFace
-cairo_font_face_get_type(1);
-cairo_font_face_get_type($fontface);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-int(0)
-
-Warning: cairo_font_face_get_type() expects exactly 1 parameter, 0 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_face_get_type() must be an instance of CairoFontFace, integer given
-
-Warning: cairo_font_face_get_type() expects parameter 1 to be CairoFontFace, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontFace/cairo_font_face_status.phpt b/tests/CairoFontFace/cairo_font_face_status.phpt
deleted file mode 100644
index 2621e597..00000000
--- a/tests/CairoFontFace/cairo_font_face_status.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_font_face_status() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$status = cairo_font_face_status($fontface);
-var_dump($status);
-
-var_dump($status == CAIRO_STATUS_SUCCESS);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_face_status();
-cairo_font_face_status($fontface, 1);
-
-// check arg types, should be fontface object
-cairo_font_face_status(1);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-int(0)
-bool(true)
-
-Warning: cairo_font_face_status() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_face_status() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_face_status() must be an instance of CairoFontFace, integer given
-
-Warning: cairo_font_face_status() expects parameter 1 to be CairoFontFace, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontFace/create_toyfont.inc b/tests/CairoFontFace/create_toyfont.inc
index 16fe8e22..2731291d 100644
--- a/tests/CairoFontFace/create_toyfont.inc
+++ b/tests/CairoFontFace/create_toyfont.inc
@@ -2,7 +2,7 @@
 if(function_exists('cairo_toy_font_face_create')) {
     $fontface = new CairoToyFontFace('sans-serif');
 } else {
-    $surface = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+    $surface = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
     $context = new CairoContext($surface);
     $context->selectFontFace('sans-serif');
     $fontface = $context->getFontFace();
diff --git a/tests/CairoFontFace/getType.phpt b/tests/CairoFontFace/getType.phpt
index d1067ee2..7066911b 100644
--- a/tests/CairoFontFace/getType.phpt
+++ b/tests/CairoFontFace/getType.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoFontFace->getType() method
+Cairo\FontFace->getType() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -13,13 +13,13 @@ var_dump($fontface->getType());
 
 try {
     $fontface->getType('foo');
-    trigger_error('CairoFontFace->getType requires no arguments');
-} catch (CairoException $e) {
+    trigger_error('Cairo\FontFace->getType requires no arguments');
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-int(0)
-CairoFontFace::getType() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\FontFace::getType() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontFace/status.phpt b/tests/CairoFontFace/status.phpt
index 5c3dd224..97d20188 100644
--- a/tests/CairoFontFace/status.phpt
+++ b/tests/CairoFontFace/status.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoFontFace->status() method
+Cairo\FontFace->status() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -18,13 +18,13 @@ var_dump($status == CairoStatus::SUCCESS);
 try {
     $fontface->status('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-int(0)
+long(0)
 bool(true)
-CairoFontFace::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\FontFace::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/CairoHintMetrics_constants.phpt b/tests/CairoFontOptions/CairoHintMetrics_constants.phpt
index 15f83cc2..d1542cd9 100644
--- a/tests/CairoFontOptions/CairoHintMetrics_constants.phpt
+++ b/tests/CairoFontOptions/CairoHintMetrics_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoHintMetrics class constants
+Cairo\HintMetrics class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -13,7 +13,7 @@ $constants = array(
 	);
 
 foreach($constants as $name) {
-	var_dump(defined('CairoHintMetrics::' . $name));
+	var_dump(defined('Cairo\HintMetrics::' . $name));
 }
 ?>
 --EXPECT--
diff --git a/tests/CairoFontOptions/CairoHintStyle_constants.phpt b/tests/CairoFontOptions/CairoHintStyle_constants.phpt
index 914d5166..7567440a 100644
--- a/tests/CairoFontOptions/CairoHintStyle_constants.phpt
+++ b/tests/CairoFontOptions/CairoHintStyle_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoHintStyle class constants
+Cairo\HintStyle class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -15,7 +15,7 @@ $constants = array(
 	);
 
 foreach($constants as $name) {
-	var_dump(defined('CairoHintStyle::' . $name));
+	var_dump(defined('Cairo\HintStyle::' . $name));
 }
 ?>
 --EXPECT--
diff --git a/tests/CairoFontOptions/__construct.phpt b/tests/CairoFontOptions/__construct.phpt
index 88c49b04..34501c4b 100644
--- a/tests/CairoFontOptions/__construct.phpt
+++ b/tests/CairoFontOptions/__construct.phpt
@@ -1,23 +1,23 @@
 --TEST--
-new CairoFontOptions [ __construct() method ]
+new Cairo\FontOptions [ __construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 /* Wrong number args */
 try {
-    new CairoFontOptions('foo');
+    new Cairo\FontOptions('foo');
     trigger_error('__construct requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-CairoFontOptions::__construct() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\FontOptions::__construct() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_create.phpt b/tests/CairoFontOptions/cairo_font_options_create.phpt
deleted file mode 100644
index 04db89e7..00000000
--- a/tests/CairoFontOptions/cairo_font_options_create.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-cairo_font_options_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-// check number of args - should accept 0
-cairo_font_options_create(1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_font_options_create() expects exactly 0 parameters, 1 given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_equal.phpt b/tests/CairoFontOptions/cairo_font_options_equal.phpt
deleted file mode 100644
index 79005caf..00000000
--- a/tests/CairoFontOptions/cairo_font_options_equal.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-cairo_font_options_equal() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-$options2 = cairo_font_options_create();
-
-var_dump(cairo_font_options_equal($options, $options2));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_font_options_equal();
-cairo_font_options_equal($options);
-cairo_font_options_equal($options, $options2, 1);
-
-// check arg types, should be fontoptions objects
-cairo_font_options_equal(1, $options2);
-cairo_font_options_equal($options, 1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-bool(true)
-
-Warning: cairo_font_options_equal() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_font_options_equal() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_font_options_equal() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_equal() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_equal() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_font_options_equal() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_equal() expects parameter 2 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_get_antialias.phpt b/tests/CairoFontOptions/cairo_font_options_get_antialias.phpt
deleted file mode 100644
index 18ba0d8b..00000000
--- a/tests/CairoFontOptions/cairo_font_options_get_antialias.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_font_options_get_antialias() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-var_dump(cairo_font_options_get_antialias($options));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_options_get_antialias();
-cairo_font_options_get_antialias($options, 1);
-
-// check arg types, should be options object
-cairo_font_options_get_antialias(1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-int(0)
-
-Warning: cairo_font_options_get_antialias() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_options_get_antialias() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_get_antialias() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_get_antialias() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_get_hint_metrics.phpt b/tests/CairoFontOptions/cairo_font_options_get_hint_metrics.phpt
deleted file mode 100644
index 35729e36..00000000
--- a/tests/CairoFontOptions/cairo_font_options_get_hint_metrics.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_font_options_get_hint_metrics() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-var_dump(cairo_font_options_get_hint_metrics($options));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_options_get_hint_metrics();
-cairo_font_options_get_hint_metrics($options, 1);
-
-// check arg types, should be options object
-cairo_font_options_get_hint_metrics(1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-int(0)
-
-Warning: cairo_font_options_get_hint_metrics() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_options_get_hint_metrics() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_get_hint_metrics() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_get_hint_metrics() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_get_hint_style.phpt b/tests/CairoFontOptions/cairo_font_options_get_hint_style.phpt
deleted file mode 100644
index e34ea852..00000000
--- a/tests/CairoFontOptions/cairo_font_options_get_hint_style.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_font_options_get_hint_style() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-var_dump(cairo_font_options_get_hint_style($options));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_options_get_hint_style();
-cairo_font_options_get_hint_style($options, 1);
-
-// check arg types, should be options object
-cairo_font_options_get_hint_style(1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-int(0)
-
-Warning: cairo_font_options_get_hint_style() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_options_get_hint_style() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_get_hint_style() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_get_hint_style() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_get_subpixel_order.phpt b/tests/CairoFontOptions/cairo_font_options_get_subpixel_order.phpt
deleted file mode 100644
index d57ebfa4..00000000
--- a/tests/CairoFontOptions/cairo_font_options_get_subpixel_order.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_font_options_get_subpixel_order() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-var_dump(cairo_font_options_get_subpixel_order($options));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_options_get_subpixel_order();
-cairo_font_options_get_subpixel_order($options, 1);
-
-// check arg types, should be options object
-cairo_font_options_get_subpixel_order(1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-int(0)
-
-Warning: cairo_font_options_get_subpixel_order() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_options_get_subpixel_order() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_get_subpixel_order() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_get_subpixel_order() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_hash.phpt b/tests/CairoFontOptions/cairo_font_options_hash.phpt
deleted file mode 100644
index c3dbf30f..00000000
--- a/tests/CairoFontOptions/cairo_font_options_hash.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_font_options_hash() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-var_dump(cairo_font_options_hash($options));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_options_hash();
-cairo_font_options_hash($options, 1);
-
-// check arg types, should be options object
-cairo_font_options_hash(1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-int(0)
-
-Warning: cairo_font_options_hash() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_options_hash() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_hash() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_hash() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_merge.phpt b/tests/CairoFontOptions/cairo_font_options_merge.phpt
deleted file mode 100644
index 571037f0..00000000
--- a/tests/CairoFontOptions/cairo_font_options_merge.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-cairo_font_options_merge() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-$options2 = cairo_font_options_create();
-
-cairo_font_options_merge($options, $options2);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_font_options_merge();
-cairo_font_options_merge($options);
-cairo_font_options_merge($options, $options2, 1);
-
-// check arg types, should be fontoptions objects
-cairo_font_options_merge(1, $options2);
-cairo_font_options_merge($options, 1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_font_options_merge() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_font_options_merge() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_font_options_merge() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_merge() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_merge() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_font_options_merge() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_merge() expects parameter 2 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_set_antialias.phpt b/tests/CairoFontOptions/cairo_font_options_set_antialias.phpt
deleted file mode 100644
index 6f4ee91d..00000000
--- a/tests/CairoFontOptions/cairo_font_options_set_antialias.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_font_options_set_antialias() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-cairo_font_options_set_antialias($options, CAIRO_ANTIALIAS_SUBPIXEL);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_font_options_set_antialias();
-cairo_font_options_set_antialias($options);
-cairo_font_options_set_antialias($options, CAIRO_ANTIALIAS_SUBPIXEL, 1);
-
-// check arg types, should be fontoptions objects
-cairo_font_options_set_antialias(1, CAIRO_ANTIALIAS_SUBPIXEL);
-cairo_font_options_set_antialias($options, array());
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_font_options_set_antialias() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_font_options_set_antialias() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_font_options_set_antialias() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_set_antialias() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_set_antialias() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
-
-Warning: cairo_font_options_set_antialias() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_set_hint_metrics.phpt b/tests/CairoFontOptions/cairo_font_options_set_hint_metrics.phpt
deleted file mode 100644
index 96f42b3e..00000000
--- a/tests/CairoFontOptions/cairo_font_options_set_hint_metrics.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_font_options_set_hint_metrics() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-cairo_font_options_set_hint_metrics($options, CAIRO_HINT_METRICS_ON);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_font_options_set_hint_metrics();
-cairo_font_options_set_hint_metrics($options);
-cairo_font_options_set_hint_metrics($options, CAIRO_HINT_METRICS_ON, 1);
-
-// check arg types, should be fontoptions objects
-cairo_font_options_set_hint_metrics(1, CAIRO_HINT_METRICS_ON);
-cairo_font_options_set_hint_metrics($options, array());
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_font_options_set_hint_metrics() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_font_options_set_hint_metrics() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_font_options_set_hint_metrics() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_set_hint_metrics() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_set_hint_metrics() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
-
-Warning: cairo_font_options_set_hint_metrics() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_set_hint_style.phpt b/tests/CairoFontOptions/cairo_font_options_set_hint_style.phpt
deleted file mode 100644
index 56b924a9..00000000
--- a/tests/CairoFontOptions/cairo_font_options_set_hint_style.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_font_options_set_hint_style() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-cairo_font_options_set_hint_style($options, CAIRO_HINT_STYLE_MEDIUM);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_font_options_set_hint_style();
-cairo_font_options_set_hint_style($options);
-cairo_font_options_set_hint_style($options, CAIRO_HINT_STYLE_MEDIUM, 1);
-
-// check arg types, should be fontoptions objects
-cairo_font_options_set_hint_style(1, CAIRO_HINT_STYLE_MEDIUM);
-cairo_font_options_set_hint_style($options, array());
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_font_options_set_hint_style() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_font_options_set_hint_style() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_font_options_set_hint_style() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_set_hint_style() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_set_hint_style() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
-
-Warning: cairo_font_options_set_hint_style() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_set_subpixel_order.phpt b/tests/CairoFontOptions/cairo_font_options_set_subpixel_order.phpt
deleted file mode 100644
index 9361b29f..00000000
--- a/tests/CairoFontOptions/cairo_font_options_set_subpixel_order.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_font_options_set_subpixel_order() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-cairo_font_options_set_subpixel_order($options, CAIRO_SUBPIXEL_ORDER_RGB);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_font_options_set_subpixel_order();
-cairo_font_options_set_subpixel_order($options);
-cairo_font_options_set_subpixel_order($options, CAIRO_SUBPIXEL_ORDER_RGB, 1);
-
-// check arg types, should be fontoptions objects
-cairo_font_options_set_subpixel_order(1, CAIRO_SUBPIXEL_ORDER_RGB);
-cairo_font_options_set_subpixel_order($options, array());
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_font_options_set_subpixel_order() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_font_options_set_subpixel_order() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_font_options_set_subpixel_order() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_set_subpixel_order() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_set_subpixel_order() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
-
-Warning: cairo_font_options_set_subpixel_order() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/cairo_font_options_status.phpt b/tests/CairoFontOptions/cairo_font_options_status.phpt
deleted file mode 100644
index 28f62849..00000000
--- a/tests/CairoFontOptions/cairo_font_options_status.phpt
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-cairo_font_options_status() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$options = cairo_font_options_create();
-var_dump($options);
-
-$status = cairo_font_options_status($options);
-var_dump($status);
-var_dump($status == CAIRO_STATUS_SUCCESS);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_font_options_status();
-cairo_font_options_status($options, 1);
-
-// check arg types, should be options object
-cairo_font_options_status(1);
-?>
---EXPECTF--
-object(CairoFontOptions)#%d (0) {
-}
-int(0)
-bool(true)
-
-Warning: cairo_font_options_status() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_font_options_status() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_font_options_status() must be an instance of CairoFontOptions, integer given
-
-Warning: cairo_font_options_status() expects parameter 1 to be CairoFontOptions, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoFontOptions/equal.phpt b/tests/CairoFontOptions/equal.phpt
index d7b610fb..4687eb9a 100644
--- a/tests/CairoFontOptions/equal.phpt
+++ b/tests/CairoFontOptions/equal.phpt
@@ -1,22 +1,22 @@
 --TEST--
-CairoFontOptions->equal() method
+Cairo\FontOptions->equal() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
-$options2 = new CairoFontOptions();
+$options2 = new Cairo\FontOptions();
 var_dump($options->equal($options2));
 
 /* Wrong number args 1*/
 try {
     $options->equal();
     trigger_error('equal requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -24,7 +24,7 @@ try {
 try {
     $options->equal($options2, 1);
     trigger_error('equal requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -32,14 +32,14 @@ try {
 try {
     $options->equal(1);
     trigger_error('equal requires cairofontoptions instance');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
 bool(true)
-CairoFontOptions::equal() expects exactly 1 parameter, 0 given
-CairoFontOptions::equal() expects exactly 1 parameter, 2 given
-CairoFontOptions::equal() expects parameter 1 to be CairoFontOptions, integer given
\ No newline at end of file
+Cairo\FontOptions::equal() expects exactly 1 parameter, 0 given
+Cairo\FontOptions::equal() expects exactly 1 parameter, 2 given
+Cairo\FontOptions::equal() expects parameter 1 to be Cairo\FontOptions, int given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/getAntialias.phpt b/tests/CairoFontOptions/getAntialias.phpt
index 4e582260..458489cc 100644
--- a/tests/CairoFontOptions/getAntialias.phpt
+++ b/tests/CairoFontOptions/getAntialias.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoFontOptions->getAntialias() method
+Cairo\FontOptions->getAntialias() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 var_dump($options->getAntialias());
@@ -15,12 +15,12 @@ var_dump($options->getAntialias());
 try {
     $options->getAntialias('foo');
     trigger_error('getAntialias requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-int(0)
-CairoFontOptions::getAntialias() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\FontOptions::getAntialias() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/getHintMetrics.phpt b/tests/CairoFontOptions/getHintMetrics.phpt
index e75964d0..35b26693 100644
--- a/tests/CairoFontOptions/getHintMetrics.phpt
+++ b/tests/CairoFontOptions/getHintMetrics.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoFontOptions->getHintMetrics() method
+Cairo\FontOptions->getHintMetrics() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 var_dump($options->getHintMetrics());
@@ -15,12 +15,12 @@ var_dump($options->getHintMetrics());
 try {
     $options->getHintMetrics('foo');
     trigger_error('getHintMetrics requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-int(0)
-CairoFontOptions::getHintMetrics() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\FontOptions::getHintMetrics() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/getHintStyle.phpt b/tests/CairoFontOptions/getHintStyle.phpt
index 95a1c86d..99e62801 100644
--- a/tests/CairoFontOptions/getHintStyle.phpt
+++ b/tests/CairoFontOptions/getHintStyle.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoFontOptions->getHintStyle() method
+Cairo\FontOptions->getHintStyle() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 var_dump($options->getHintStyle());
@@ -15,12 +15,12 @@ var_dump($options->getHintStyle());
 try {
     $options->getHintStyle('foo');
     trigger_error('getHintStyle requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-int(0)
-CairoFontOptions::getHintStyle() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\FontOptions::getHintStyle() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/getSubpixelOrder.phpt b/tests/CairoFontOptions/getSubpixelOrder.phpt
index 6a5e4b39..4ed93de8 100644
--- a/tests/CairoFontOptions/getSubpixelOrder.phpt
+++ b/tests/CairoFontOptions/getSubpixelOrder.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoFontOptions->getSubpixelOrder() method
+Cairo\FontOptions->getSubpixelOrder() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 var_dump($options->getSubpixelOrder());
@@ -15,12 +15,12 @@ var_dump($options->getSubpixelOrder());
 try {
     $options->getSubpixelOrder('foo');
     trigger_error('getSubpixelOrder requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-int(0)
-CairoFontOptions::getSubpixelOrder() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\FontOptions::getSubpixelOrder() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/hash.phpt b/tests/CairoFontOptions/hash.phpt
index 42bae0bc..869d12cb 100644
--- a/tests/CairoFontOptions/hash.phpt
+++ b/tests/CairoFontOptions/hash.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoFontOptions->hash() method
+Cairo\FontOptions->hash() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 var_dump($options->hash());
@@ -15,12 +15,12 @@ var_dump($options->hash());
 try {
     $options->hash('foo');
     trigger_error('hash requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-int(0)
-CairoFontOptions::hash() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\FontOptions::hash() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/merge.phpt b/tests/CairoFontOptions/merge.phpt
index e5add6b0..442b4b9d 100644
--- a/tests/CairoFontOptions/merge.phpt
+++ b/tests/CairoFontOptions/merge.phpt
@@ -1,22 +1,22 @@
 --TEST--
-CairoFontOptions->merge() method
+Cairo\FontOptions->merge() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
-$options2 = new CairoFontOptions();
+$options2 = new Cairo\FontOptions();
 $options->merge($options2);
 
 /* Wrong number args 1*/
 try {
     $options->merge();
     trigger_error('merge requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -24,7 +24,7 @@ try {
 try {
     $options->merge($options2, 1);
     trigger_error('merge requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -32,13 +32,13 @@ try {
 try {
     $options->merge(1);
     trigger_error('merge requires cairofontoptions instance');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-CairoFontOptions::merge() expects exactly 1 parameter, 0 given
-CairoFontOptions::merge() expects exactly 1 parameter, 2 given
-CairoFontOptions::merge() expects parameter 1 to be CairoFontOptions, integer given
\ No newline at end of file
+Cairo\FontOptions::merge() expects exactly 1 parameter, 0 given
+Cairo\FontOptions::merge() expects exactly 1 parameter, 2 given
+Cairo\FontOptions::merge() expects parameter 1 to be Cairo\FontOptions, int given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/setAntialias.phpt b/tests/CairoFontOptions/setAntialias.phpt
index 1f3326f4..e40f5b60 100644
--- a/tests/CairoFontOptions/setAntialias.phpt
+++ b/tests/CairoFontOptions/setAntialias.phpt
@@ -1,29 +1,29 @@
 --TEST--
-CairoFontOptions->setAntialias() method
+Cairo\FontOptions->setAntialias() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
-$options->setAntialias(CairoAntialias::MODE_SUBPIXEL);
+$options->setAntialias(Cairo\Antialias::MODE_SUBPIXEL);
 
 /* Wrong number args 1*/
 try {
     $options->setAntialias();
     trigger_error('setAntialias requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 2 */
 try {
-    $options->setAntialias(CairoAntialias::MODE_SUBPIXEL, 1);
+    $options->setAntialias(Cairo\Antialias::MODE_SUBPIXEL, 1);
     trigger_error('setAntialias requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -31,13 +31,13 @@ try {
 try {
     $options->setAntialias(array());
     trigger_error('setAntialias requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-CairoFontOptions::setAntialias() expects exactly 1 parameter, 0 given
-CairoFontOptions::setAntialias() expects exactly 1 parameter, 2 given
-CairoFontOptions::setAntialias() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\FontOptions::setAntialias() expects exactly 1 parameter, 0 given
+Cairo\FontOptions::setAntialias() expects exactly 1 parameter, 2 given
+Cairo\FontOptions::setAntialias() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/setHintMetrics.phpt b/tests/CairoFontOptions/setHintMetrics.phpt
index 2b85afee..8023697f 100644
--- a/tests/CairoFontOptions/setHintMetrics.phpt
+++ b/tests/CairoFontOptions/setHintMetrics.phpt
@@ -1,29 +1,29 @@
 --TEST--
-CairoFontOptions->setHintMetrics() method
+Cairo\FontOptions->setHintMetrics() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
-$options->setHintMetrics(CairoHintMetrics::METRICS_ON);
+$options->setHintMetrics(Cairo\HintMetrics::METRICS_ON);
 
 /* Wrong number args 1*/
 try {
     $options->setHintMetrics();
     trigger_error('setHintMetrics requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 2 */
 try {
-    $options->setHintMetrics(CairoHintMetrics::METRICS_ON, 1);
+    $options->setHintMetrics(Cairo\HintMetrics::METRICS_ON, 1);
     trigger_error('setHintMetrics requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -31,13 +31,13 @@ try {
 try {
     $options->setHintMetrics(array());
     trigger_error('setHintMetrics requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-CairoFontOptions::setHintMetrics() expects exactly 1 parameter, 0 given
-CairoFontOptions::setHintMetrics() expects exactly 1 parameter, 2 given
-CairoFontOptions::setHintMetrics() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\FontOptions::setHintMetrics() expects exactly 1 parameter, 0 given
+Cairo\FontOptions::setHintMetrics() expects exactly 1 parameter, 2 given
+Cairo\FontOptions::setHintMetrics() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/setHintStyle.phpt b/tests/CairoFontOptions/setHintStyle.phpt
index 56a00ba5..5eb1e26b 100644
--- a/tests/CairoFontOptions/setHintStyle.phpt
+++ b/tests/CairoFontOptions/setHintStyle.phpt
@@ -1,29 +1,29 @@
 --TEST--
-CairoFontOptions->setHintStyle() method
+Cairo\FontOptions->setHintStyle() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
-$options->setHintStyle(CairoHintStyle::STYLE_FULL);
+$options->setHintStyle(Cairo\HintStyle::STYLE_FULL);
 
 /* Wrong number args 1*/
 try {
     $options->setHintStyle();
     trigger_error('setHintStyle requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 2 */
 try {
-    $options->setHintStyle(CairoHintStyle::STYLE_FULL, 1);
+    $options->setHintStyle(Cairo\HintStyle::STYLE_FULL, 1);
     trigger_error('setHintStyle requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -31,13 +31,13 @@ try {
 try {
     $options->setHintStyle(array());
     trigger_error('setHintStyle requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-CairoFontOptions::setHintStyle() expects exactly 1 parameter, 0 given
-CairoFontOptions::setHintStyle() expects exactly 1 parameter, 2 given
-CairoFontOptions::setHintStyle() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\FontOptions::setHintStyle() expects exactly 1 parameter, 0 given
+Cairo\FontOptions::setHintStyle() expects exactly 1 parameter, 2 given
+Cairo\FontOptions::setHintStyle() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/setSubpixelOrder.phpt b/tests/CairoFontOptions/setSubpixelOrder.phpt
index a456af9d..6ebddd32 100644
--- a/tests/CairoFontOptions/setSubpixelOrder.phpt
+++ b/tests/CairoFontOptions/setSubpixelOrder.phpt
@@ -1,29 +1,29 @@
 --TEST--
-CairoFontOptions->setSubpixelOrder() method
+Cairo\FontOptions->setSubpixelOrder() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
-$options->setSubpixelOrder(CairoSubpixelOrder::ORDER_RGB);
+$options->setSubpixelOrder(Cairo\SubPixelOrder::ORDER_RGB);
 
 /* Wrong number args 1*/
 try {
     $options->setSubpixelOrder();
     trigger_error('setSubpixelOrder requires 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 2 */
 try {
-    $options->setSubpixelOrder(CairoSubpixelOrder::ORDER_RGB, 1);
+    $options->setSubpixelOrder(Cairo\SubPixelOrder::ORDER_RGB, 1);
     trigger_error('setSubpixelOrder requires only 1 arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -31,13 +31,13 @@ try {
 try {
     $options->setSubpixelOrder(array());
     trigger_error('setSubpixelOrder requires int');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-CairoFontOptions::setSubpixelOrder() expects exactly 1 parameter, 0 given
-CairoFontOptions::setSubpixelOrder() expects exactly 1 parameter, 2 given
-CairoFontOptions::setSubpixelOrder() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\FontOptions::setSubpixelOrder() expects exactly 1 parameter, 0 given
+Cairo\FontOptions::setSubpixelOrder() expects exactly 1 parameter, 2 given
+Cairo\FontOptions::setSubpixelOrder() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoFontOptions/status.phpt b/tests/CairoFontOptions/status.phpt
index f5729f46..b8931d25 100644
--- a/tests/CairoFontOptions/status.phpt
+++ b/tests/CairoFontOptions/status.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoFontOptions->status() method
+Cairo\FontOptions->status() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$options = new CairoFontOptions();
+$options = new Cairo\FontOptions();
 var_dump($options);
 
 $status = $options->status();
@@ -17,13 +17,13 @@ var_dump($status == CairoStatus::SUCCESS);
 try {
     $options->status('foo');
     trigger_error('status requires no args');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-int(0)
+long(0)
 bool(true)
-CairoFontOptions::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\FontOptions::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoScaledFont/__construct.phpt b/tests/CairoScaledFont/__construct.phpt
index 2a63ab6f..5de60a9d 100644
--- a/tests/CairoScaledFont/__construct.phpt
+++ b/tests/CairoScaledFont/__construct.phpt
@@ -1,5 +1,5 @@
 --TEST--
-new CairoScaledFont [ __construct() method ]
+new Cairo\ScaledFont [ __construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,96 +8,96 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 /* Wrong number args - 1 */
 try {
-    new CairoScaledFont();
+    new Cairo\ScaledFont();
     trigger_error('CairoScaled font requires 4 args, none given');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    new CairoScaledFont($fontface);
+    new Cairo\ScaledFont($fontface);
     trigger_error('CairoScaled font requires 4 args, 1 given');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 3 */
 try {
-    new CairoScaledFont($fontface, $matrix1);
+    new Cairo\ScaledFont($fontface, $matrix1);
     trigger_error('CairoScaled font requires 4 args, 2 given');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    new CairoScaledFont($fontface, $matrix1, $matrix2);
+    new Cairo\ScaledFont($fontface, $matrix1, $matrix2);
     trigger_error('CairoScaled font requires 4 args, 3 given');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 5 */
 try {
-    new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions, 1);
+    new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions, 1);
     trigger_error('CairoScaled font requires 4 args, 5 given');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong Arg type 1 */
 try {
-    new CairoScaledFont(array(), $matrix1, $matrix2, $fontoptions);
-    trigger_error('CairoScaled font requires CairoFontFace as first parameter');
-} catch (CairoException $e) {
+    new Cairo\ScaledFont(array(), $matrix1, $matrix2, $fontoptions);
+    trigger_error('CairoScaled font requires Cairo\FontFace as first parameter');
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong Arg type 2 */
 try {
-    new CairoScaledFont($fontface, array(), $matrix2, $fontoptions);
-    trigger_error('CairoScaled font requires CairoFontFace as second parameter');
-} catch (CairoException $e) {
+    new Cairo\ScaledFont($fontface, array(), $matrix2, $fontoptions);
+    trigger_error('CairoScaled font requires Cairo\FontFace as second parameter');
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong Arg type 3 */
 try {
-    new CairoScaledFont($fontface, $matrix1, array(), $fontoptions);
-    trigger_error('CairoScaled font requires CairoFontFace as third parameter');
-} catch (CairoException $e) {
+    new Cairo\ScaledFont($fontface, $matrix1, array(), $fontoptions);
+    trigger_error('CairoScaled font requires Cairo\FontFace as third parameter');
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong Arg type 4 */
 try {
-    new CairoScaledFont($fontface, $matrix1, $matrix2, array());
-    trigger_error('CairoScaled font requires CairoFontFace as fourth parameter');
-} catch (CairoException $e) {
+    new Cairo\ScaledFont($fontface, $matrix1, $matrix2, array());
+    trigger_error('CairoScaled font requires Cairo\FontFace as fourth parameter');
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-CairoScaledFont::__construct() expects exactly 4 parameters, 0 given
-CairoScaledFont::__construct() expects exactly 4 parameters, 1 given
-CairoScaledFont::__construct() expects exactly 4 parameters, 2 given
-CairoScaledFont::__construct() expects exactly 4 parameters, 3 given
-CairoScaledFont::__construct() expects exactly 4 parameters, 5 given
-CairoScaledFont::__construct() expects parameter 1 to be CairoFontFace, array given
-CairoScaledFont::__construct() expects parameter 2 to be CairoMatrix, array given
-CairoScaledFont::__construct() expects parameter 3 to be CairoMatrix, array given
-CairoScaledFont::__construct() expects parameter 4 to be CairoFontOptions, array given
\ No newline at end of file
+Cairo\ScaledFont::__construct() expects exactly 4 parameters, 0 given
+Cairo\ScaledFont::__construct() expects exactly 4 parameters, 1 given
+Cairo\ScaledFont::__construct() expects exactly 4 parameters, 2 given
+Cairo\ScaledFont::__construct() expects exactly 4 parameters, 3 given
+Cairo\ScaledFont::__construct() expects exactly 4 parameters, 5 given
+Cairo\ScaledFont::__construct() expects parameter 1 to be Cairo\FontFace, array given
+Cairo\ScaledFont::__construct() expects parameter 2 to be Cairo\Matrix, array given
+Cairo\ScaledFont::__construct() expects parameter 3 to be Cairo\Matrix, array given
+Cairo\ScaledFont::__construct() expects parameter 4 to be Cairo\FontOptions, array given
\ No newline at end of file
diff --git a/tests/CairoScaledFont/cairo_scaled_font_create.phpt b/tests/CairoScaledFont/cairo_scaled_font_create.phpt
deleted file mode 100644
index 2fabf4bf..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_create.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-cairo_scaled_font_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - wants 4
-cairo_scaled_font_create();
-cairo_scaled_font_create($fontface);
-cairo_scaled_font_create($fontface, $matrix1);
-cairo_scaled_font_create($fontface, $matrix1, $matrix2);
-cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options, 1);
-
-// check arg types, should be CairoFontFace, CairoMatrix, CairoMatrix, CairoFontOptions
-cairo_scaled_font_create(array(), $matrix1, $matrix2, $options);
-cairo_scaled_font_create($fontface, array(), $matrix2, $options);
-cairo_scaled_font_create($fontface, $matrix1, array(), $options);
-cairo_scaled_font_create($fontface, $matrix1, $matrix2, array());
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-
-Warning: cairo_scaled_font_create() expects exactly 4 parameters, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_create() expects exactly 4 parameters, 1 given in %s on line %d
-
-Warning: cairo_scaled_font_create() expects exactly 4 parameters, 2 given in %s on line %d
-
-Warning: cairo_scaled_font_create() expects exactly 4 parameters, 3 given in %s on line %d
-
-Warning: cairo_scaled_font_create() expects exactly 4 parameters, 5 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_create() must be an instance of CairoFontFace, array given
-
-Warning: cairo_scaled_font_create() expects parameter 1 to be CairoFontFace, array given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_scaled_font_create() must be an instance of CairoMatrix, array given
-
-Warning: cairo_scaled_font_create() expects parameter 2 to be CairoMatrix, array given in %s on line %d
-CAUGHT ERROR: Argument 3 passed to cairo_scaled_font_create() must be an instance of CairoMatrix, array given
-
-Warning: cairo_scaled_font_create() expects parameter 3 to be CairoMatrix, array given in %s on line %d
-CAUGHT ERROR: Argument 4 passed to cairo_scaled_font_create() must be an instance of CairoFontOptions, array given
-
-Warning: cairo_scaled_font_create() expects parameter 4 to be CairoFontOptions, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoScaledFont/cairo_scaled_font_extents.phpt b/tests/CairoScaledFont/cairo_scaled_font_extents.phpt
deleted file mode 100644
index f5369412..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_extents.phpt
+++ /dev/null
@@ -1,57 +0,0 @@
---TEST--
-cairo_scaled_font_extents() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_extents($scaledfont));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_scaled_font_extents();
-cairo_scaled_font_extents($scaledfont, 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_extents(1);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-array(5) {
-  ["ascent"]=>
-  float(%f)
-  ["descent"]=>
-  float(%f)
-  ["height"]=>
-  float(%f)
-  ["max_x_advance"]=>
-  float(%f)
-  ["max_y_advance"]=>
-  float(%f)
-}
-
-Warning: cairo_scaled_font_extents() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_extents() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_extents() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_extents() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
diff --git a/tests/CairoScaledFont/cairo_scaled_font_get_ctm.phpt b/tests/CairoScaledFont/cairo_scaled_font_get_ctm.phpt
deleted file mode 100644
index 4b74434c..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_get_ctm.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_scaled_font_get_ctm() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_get_ctm($scaledfont));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_scaled_font_get_ctm();
-cairo_scaled_font_get_ctm($scaledfont, 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_get_ctm(1);
-
-die; // GC issue makes bogus memleaks without this
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-
-Warning: cairo_scaled_font_get_ctm() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_get_ctm() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_get_ctm() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_get_ctm() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
diff --git a/tests/CairoScaledFont/cairo_scaled_font_get_font_face.phpt b/tests/CairoScaledFont/cairo_scaled_font_get_font_face.phpt
deleted file mode 100644
index 97c74273..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_get_font_face.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_scaled_font_get_font_face() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_get_font_face($scaledfont));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_scaled_font_get_font_face();
-cairo_scaled_font_get_font_face($scaledfont, 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_get_font_face(1);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-object(CairoToyFontFace)#%d (0) {
-}
-
-Warning: cairo_scaled_font_get_font_face() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_get_font_face() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_get_font_face() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_get_font_face() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoScaledFont/cairo_scaled_font_get_font_matrix.phpt b/tests/CairoScaledFont/cairo_scaled_font_get_font_matrix.phpt
deleted file mode 100644
index 4d949db2..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_get_font_matrix.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_scaled_font_get_font_matrix() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_get_font_matrix($scaledfont));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_scaled_font_get_font_matrix();
-cairo_scaled_font_get_font_matrix($scaledfont, 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_get_font_matrix(1);
-
-die; // GC issues, bogus memleaks reported without this
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-
-Warning: cairo_scaled_font_get_font_matrix() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_get_font_matrix() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_get_font_matrix() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_get_font_matrix() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
diff --git a/tests/CairoScaledFont/cairo_scaled_font_get_font_options.phpt b/tests/CairoScaledFont/cairo_scaled_font_get_font_options.phpt
deleted file mode 100644
index 4382bcdd..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_get_font_options.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_scaled_font_get_font_options() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_get_font_options($scaledfont));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_scaled_font_get_font_options();
-cairo_scaled_font_get_font_options($scaledfont, 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_get_font_options(1);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_scaled_font_get_font_options() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_get_font_options() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_get_font_options() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_get_font_options() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoScaledFont/cairo_scaled_font_get_scale_matrix.phpt b/tests/CairoScaledFont/cairo_scaled_font_get_scale_matrix.phpt
deleted file mode 100644
index 9aa19b5a..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_get_scale_matrix.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-cairo_scaled_font_get_scale_matrix() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_get_scale_matrix($scaledfont));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_scaled_font_get_scale_matrix();
-cairo_scaled_font_get_scale_matrix($scaledfont, 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_get_scale_matrix(1);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-object(CairoMatrix)#%d (0) {
-}
-
-Warning: cairo_scaled_font_get_scale_matrix() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_get_scale_matrix() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_get_scale_matrix() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_get_scale_matrix() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoScaledFont/cairo_scaled_font_get_type.phpt b/tests/CairoScaledFont/cairo_scaled_font_get_type.phpt
deleted file mode 100644
index b46bd96a..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_get_type.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
---TEST--
-cairo_scaled_font_get_type() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_get_type($scaledfont));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// requires exactly 1 arg
-cairo_scaled_font_get_type();
-cairo_scaled_font_get_type($scaledfont);
-
-// arg type is CairoScaledFont
-cairo_scaled_font_get_type(1);
-cairo_scaled_font_get_type($scaledfont);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-int(%d)
-
-Warning: cairo_scaled_font_get_type() expects exactly 1 parameter, 0 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_get_type() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_get_type() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
diff --git a/tests/CairoScaledFont/cairo_scaled_font_glyph_extents.phpt b/tests/CairoScaledFont/cairo_scaled_font_glyph_extents.phpt
deleted file mode 100644
index 766cdca6..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_glyph_extents.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-cairo_scaled_font_glyph_extents() function
---SKIPIF--
-<?php
-die('skip - Glyph support not complete');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-?>
---EXPECT--
\ No newline at end of file
diff --git a/tests/CairoScaledFont/cairo_scaled_font_status.phpt b/tests/CairoScaledFont/cairo_scaled_font_status.phpt
deleted file mode 100644
index 7c946cfd..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_status.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-cairo_scaled_font_status() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-$status = cairo_scaled_font_status($scaledfont);
-var_dump($status);
-
-var_dump($status == CAIRO_STATUS_SUCCESS);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_scaled_font_status();
-cairo_scaled_font_status($scaledfont, 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_status(1);
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-int(0)
-bool(true)
-
-Warning: cairo_scaled_font_status() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_status() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_status() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_status() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoScaledFont/cairo_scaled_font_text_extents.phpt b/tests/CairoScaledFont/cairo_scaled_font_text_extents.phpt
deleted file mode 100644
index 7e6ac2fe..00000000
--- a/tests/CairoScaledFont/cairo_scaled_font_text_extents.phpt
+++ /dev/null
@@ -1,62 +0,0 @@
---TEST--
-cairo_scaled_font_text_extents() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-include(dirname(__FILE__) . '/create_toyfont.inc');
-var_dump($fontface);
-
-$matrix1 = cairo_matrix_init(1);
-$matrix2 = cairo_matrix_init(1, 1);
-$options = cairo_font_options_create();
-
-$scaledfont = cairo_scaled_font_create($fontface, $matrix1, $matrix2, $options);
-var_dump($scaledfont);
-
-var_dump(cairo_scaled_font_text_extents($scaledfont, 'foobar'));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_scaled_font_text_extents();
-cairo_scaled_font_text_extents($scaledfont, 'foobar', 1);
-
-// check arg types, should be scaledfont object
-cairo_scaled_font_text_extents(1, 'foobar');
-cairo_scaled_font_text_extents($scaledfont, array());
-?>
---EXPECTF--
-object(CairoToyFontFace)#%d (0) {
-}
-object(CairoScaledFont)#%d (0) {
-}
-array(6) {
-  ["x_bearing"]=>
-  float(%f)
-  ["y_bearing"]=>
-  float(%f)
-  ["width"]=>
-  float(%f)
-  ["height"]=>
-  float(%f)
-  ["x_advance"]=>
-  float(%f)
-  ["y_advance"]=>
-  float(%f)
-}
-
-Warning: cairo_scaled_font_text_extents() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_scaled_font_text_extents() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_scaled_font_text_extents() must be an instance of CairoScaledFont, integer given
-
-Warning: cairo_scaled_font_text_extents() expects parameter 1 to be CairoScaledFont, integer given in %s on line %d
-
-Warning: cairo_scaled_font_text_extents() expects parameter 2 to be string, array given in %s on line %d
diff --git a/tests/CairoScaledFont/create_toyfont.inc b/tests/CairoScaledFont/create_toyfont.inc
index 16fe8e22..2731291d 100644
--- a/tests/CairoScaledFont/create_toyfont.inc
+++ b/tests/CairoScaledFont/create_toyfont.inc
@@ -2,7 +2,7 @@
 if(function_exists('cairo_toy_font_face_create')) {
     $fontface = new CairoToyFontFace('sans-serif');
 } else {
-    $surface = new CairoImageSurface(CAIRO_FORMAT_ARGB32, 50, 50);
+    $surface = new Cairo\Surface\Image(CAIRO_FORMAT_ARGB32, 50, 50);
     $context = new CairoContext($surface);
     $context->selectFontFace('sans-serif');
     $fontface = $context->getFontFace();
diff --git a/tests/CairoScaledFont/extents.phpt b/tests/CairoScaledFont/extents.phpt
index de263853..5c30aa98 100644
--- a/tests/CairoScaledFont/extents.phpt
+++ b/tests/CairoScaledFont/extents.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->extents() method
+Cairo\ScaledFont->extents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 var_dump($scaled->extents());
@@ -21,14 +21,14 @@ var_dump($scaled->extents());
 try {
     $scaled->extents('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
 array(5) {
   ["ascent"]=>
@@ -42,4 +42,4 @@ array(5) {
   ["max_y_advance"]=>
   float(%f)
 }
-CairoScaledFont::extents() expects exactly 0 parameters, 1 given
+Cairo\ScaledFont::extents() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoScaledFont/getCtm.phpt b/tests/CairoScaledFont/getCtm.phpt
index 7b42ee13..b4bbcb67 100644
--- a/tests/CairoScaledFont/getCtm.phpt
+++ b/tests/CairoScaledFont/getCtm.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->getCtm() method
+Cairo\ScaledFont->getCtm() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 var_dump($scaled->getCtm());
@@ -21,17 +21,17 @@ var_dump($scaled->getCtm());
 try {
     $scaled->getCtm('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // GC issue, bogus memleaks reported without this
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
-CairoScaledFont::getCtm() expects exactly 0 parameters, 1 given
+Cairo\ScaledFont::getCtm() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoScaledFont/getFontFace.phpt b/tests/CairoScaledFont/getFontFace.phpt
index ba21724b..bdbc8367 100644
--- a/tests/CairoScaledFont/getFontFace.phpt
+++ b/tests/CairoScaledFont/getFontFace.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->getFontFace() method
+Cairo\ScaledFont->getFontFace() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 $face2 = $scaled->getFontFace();
@@ -24,16 +24,16 @@ var_dump($face2 == $fontface);
 try {
     $scaled->getFontFace('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
 bool(true)
-CairoScaledFont::getFontFace() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\ScaledFont::getFontFace() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoScaledFont/getFontMatrix.phpt b/tests/CairoScaledFont/getFontMatrix.phpt
index 1e104b71..7e13fafd 100644
--- a/tests/CairoScaledFont/getFontMatrix.phpt
+++ b/tests/CairoScaledFont/getFontMatrix.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->getFontMatrix() method
+Cairo\ScaledFont->getFontMatrix() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 var_dump($scaled->getFontMatrix());
@@ -21,17 +21,17 @@ var_dump($scaled->getFontMatrix());
 try {
     $scaled->getFontMatrix('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 die; // GC issue, bogus memleaks reported without this
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
-CairoScaledFont::getFontMatrix() expects exactly 0 parameters, 1 given
+Cairo\ScaledFont::getFontMatrix() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoScaledFont/getFontOptions.phpt b/tests/CairoScaledFont/getFontOptions.phpt
index e796b4b4..5871b78e 100644
--- a/tests/CairoScaledFont/getFontOptions.phpt
+++ b/tests/CairoScaledFont/getFontOptions.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->getFontOptions() method
+Cairo\ScaledFont->getFontOptions() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 $options2 = $scaled->getFontOptions();
@@ -24,16 +24,16 @@ var_dump($options2 == $fontoptions);
 try {
     $scaled->getFontOptions('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
 bool(true)
-CairoScaledFont::getFontOptions() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\ScaledFont::getFontOptions() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoScaledFont/getScaleMatrix.phpt b/tests/CairoScaledFont/getScaleMatrix.phpt
index 362edd12..137b7e57 100644
--- a/tests/CairoScaledFont/getScaleMatrix.phpt
+++ b/tests/CairoScaledFont/getScaleMatrix.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->getScaleMatrix() method
+Cairo\ScaledFont->getScaleMatrix() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 var_dump($scaled->getScaleMatrix());
@@ -21,15 +21,15 @@ var_dump($scaled->getScaleMatrix());
 try {
     $scaled->getScaleMatrix('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-object(CairoMatrix)#%d (0) {
+object(Cairo\Matrix)#%d (0) {
 }
-CairoScaledFont::getScaleMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\ScaledFont::getScaleMatrix() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoScaledFont/getType.phpt b/tests/CairoScaledFont/getType.phpt
index 775cfe41..d12037f5 100644
--- a/tests/CairoScaledFont/getType.phpt
+++ b/tests/CairoScaledFont/getType.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->getType() method
+Cairo\ScaledFont->getType() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,26 +8,26 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 var_dump($scaled->getType());
 
 try {
     $scaled->getType('foo');
-    trigger_error('CairoScaledFont->getType requires no arguments');
-} catch (CairoException $e) {
+    trigger_error('Cairo\ScaledFont->getType requires no arguments');
+} catch (TypeError $e) {
     echo $e->getMessage();
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-int(%d)
-CairoScaledFont::getType() expects exactly 0 parameters, 1 given
+long(%d)
+Cairo\ScaledFont::getType() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoScaledFont/glyphExtents.phpt b/tests/CairoScaledFont/glyphExtents.phpt
index 04022433..7489949b 100644
--- a/tests/CairoScaledFont/glyphExtents.phpt
+++ b/tests/CairoScaledFont/glyphExtents.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->glyphExtents() method
+Cairo\ScaledFont->glyphExtents() method
 --SKIPIF--
 <?php
 die('skip - Cairo glyph support not complete');
@@ -8,11 +8,11 @@ die('skip - Cairo glyph support not complete');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 ?>
 --EXPECTF--
\ No newline at end of file
diff --git a/tests/CairoScaledFont/status.phpt b/tests/CairoScaledFont/status.phpt
index c8b09c38..0fc50aea 100644
--- a/tests/CairoScaledFont/status.phpt
+++ b/tests/CairoScaledFont/status.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->status() method
+Cairo\ScaledFont->status() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 $status = $scaled->status();
@@ -24,15 +24,15 @@ var_dump($status == CairoStatus::SUCCESS);
 try {
     $scaled->status('foo');
     trigger_error('status requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
-int(0)
+long(0)
 bool(true)
-CairoScaledFont::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\ScaledFont::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoScaledFont/textExtents.phpt b/tests/CairoScaledFont/textExtents.phpt
index 1bee6cd2..d7f7df07 100644
--- a/tests/CairoScaledFont/textExtents.phpt
+++ b/tests/CairoScaledFont/textExtents.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoScaledFont->textExtents() method
+Cairo\ScaledFont->textExtents() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -8,11 +8,11 @@ if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 <?php
 include(dirname(__FILE__) . '/create_toyfont.inc');
 var_dump($fontface);
-$matrix1 = new CairoMatrix(1);
-$matrix2 = new CairoMatrix(1,1);
-$fontoptions = new CairoFontOptions();
+$matrix1 = new Cairo\Matrix(1);
+$matrix2 = new Cairo\Matrix(1,1);
+$fontoptions = new Cairo\FontOptions();
 
-$scaled = new CairoScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
+$scaled = new Cairo\ScaledFont($fontface, $matrix1, $matrix2, $fontoptions);
 var_dump($scaled);
 
 var_dump($scaled->textExtents('foobar'));
@@ -21,7 +21,7 @@ var_dump($scaled->textExtents('foobar'));
 try {
     $scaled->textExtents();
     trigger_error('textExtents requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -29,7 +29,7 @@ try {
 try {
     $scaled->textExtents('foo', 1);
     trigger_error('textExtents requires only one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -37,14 +37,14 @@ try {
 try {
     $scaled->textExtents(array());
     trigger_error('textExtents requires one arg');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoToyFontFace)#%d (0) {
+object(Cairo\FontFace\Toy)#%d (0) {
 }
-object(CairoScaledFont)#%d (0) {
+object(Cairo\ScaledFont)#%d (0) {
 }
 array(6) {
   ["x_bearing"]=>
@@ -60,6 +60,6 @@ array(6) {
   ["y_advance"]=>
   float(%f)
 }
-CairoScaledFont::textExtents() expects exactly 1 parameter, 0 given
-CairoScaledFont::textExtents() expects exactly 1 parameter, 2 given
-CairoScaledFont::textExtents() expects parameter 1 to be string, array given
+Cairo\ScaledFont::textExtents() expects exactly 1 parameter, 0 given
+Cairo\ScaledFont::textExtents() expects exactly 1 parameter, 2 given
+Cairo\ScaledFont::textExtents() expects parameter 1 to be string, array given
diff --git a/tests/CairoSurface/CairoContent_constants.phpt b/tests/CairoSurface/CairoContent_constants.phpt
index afef9e83..654c32c8 100644
--- a/tests/CairoSurface/CairoContent_constants.phpt
+++ b/tests/CairoSurface/CairoContent_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoContent class constants
+Cairo\Surface\Content class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -14,7 +14,7 @@ $constants = array(
 
 $error = false;
 foreach($constants as $name) {
-	$constant = 'CairoContent::' . $name;
+	$constant = 'Cairo\Surface\Content::' . $name;
 	if (!defined($constant)) {
 		$error = true;
 		echo 'Missing Constant: ' . $constant . "\n";
diff --git a/tests/CairoSurface/CairoImageSurface/CairoFormat_constants.phpt b/tests/CairoSurface/CairoImageSurface/CairoFormat_constants.phpt
index e8c0c9f7..62f9658e 100644
--- a/tests/CairoSurface/CairoImageSurface/CairoFormat_constants.phpt
+++ b/tests/CairoSurface/CairoImageSurface/CairoFormat_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoFormat class constants
+Cairo\Surface\ImageFormat class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -15,7 +15,7 @@ $constants = array(
 
 $error = false;
 foreach($constants as $name) {
-	$constant = 'CairoFormat::' . $name;
+	$constant = 'Cairo\Surface\ImageFormat::' . $name;
 	if (!defined($constant)) {
 		$error = true;
 		echo 'Missing Constant: ' . $constant . "\n";
diff --git a/tests/CairoSurface/CairoImageSurface/CairoFormat_strideForWidth.phpt b/tests/CairoSurface/CairoImageSurface/CairoFormat_strideForWidth.phpt
index 85a7ddea..94a1d446 100644
--- a/tests/CairoSurface/CairoImageSurface/CairoFormat_strideForWidth.phpt
+++ b/tests/CairoSurface/CairoImageSurface/CairoFormat_strideForWidth.phpt
@@ -1,58 +1,58 @@
 --TEST--
-CairoFormat::strideForWidth() method
+Cairo\Surface\ImageFormat::strideForWidth() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!method_exists('CairoFormat', 'strideForWidth')) die('skip - CairoFormat::strideForWidth not available');
+if(!method_exists('Cairo\Surface\ImageFormat', 'strideForWidth')) die('skip - Cairo\Surface\ImageFormat::strideForWidth not available');
 ?>
 --FILE--
 <?php
-echo CairoFormat::strideForWidth(1, 5), PHP_EOL;
+echo Cairo\Surface\ImageFormat::strideForWidth(1, 5), PHP_EOL;
 
 /* Wrong number args */
 try {
-    CairoFormat::strideForWidth();
+    Cairo\Surface\ImageFormat::strideForWidth();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 2 */
 try {
-    CairoFormat::strideForWidth(1);
+    Cairo\Surface\ImageFormat::strideForWidth(1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 3 */
 try {
-    CairoFormat::strideForWidth(1, 1, 1);
+    Cairo\Surface\ImageFormat::strideForWidth(1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type */
 try {
-    CairoFormat::strideForWidth(array(), 1);
+    Cairo\Surface\ImageFormat::strideForWidth(array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type */
 try {
-    CairoFormat::strideForWidth(1, array());
+    Cairo\Surface\ImageFormat::strideForWidth(1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
 20
-CairoFormat::strideForWidth() expects exactly 2 parameters, 0 given
-CairoFormat::strideForWidth() expects exactly 2 parameters, 1 given
-CairoFormat::strideForWidth() expects exactly 2 parameters, 3 given
-CairoFormat::strideForWidth() expects parameter 1 to be long, array given
-CairoFormat::strideForWidth() expects parameter 2 to be long, array given
\ No newline at end of file
+Cairo\Surface\ImageFormat::strideForWidth() expects exactly 2 parameters, 0 given
+Cairo\Surface\ImageFormat::strideForWidth() expects exactly 2 parameters, 1 given
+Cairo\Surface\ImageFormat::strideForWidth() expects exactly 2 parameters, 3 given
+Cairo\Surface\ImageFormat::strideForWidth() expects parameter 1 to be int, array given
+Cairo\Surface\ImageFormat::strideForWidth() expects parameter 2 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/__construct.phpt b/tests/CairoSurface/CairoImageSurface/__construct.phpt
index 2b6027fc..0f65f9cc 100644
--- a/tests/CairoSurface/CairoImageSurface/__construct.phpt
+++ b/tests/CairoSurface/CairoImageSurface/__construct.phpt
@@ -1,77 +1,77 @@
 --TEST--
-new CairoImageSurface [__construct() method ]
+new Cairo\Surface\Image [__construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 /* Wrong number args - 1 */
 try {
-    new CairoImageSurface();
+    new Cairo\Surface\Image();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    new CairoImageSurface(CairoFormat::ARGB32);
+    new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 3 */
 try {
-    new CairoImageSurface(CairoFormat::ARGB32, 1);
+    new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    new CairoImageSurface(CairoFormat::ARGB32, 1, 1, 1);
+    new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    new CairoImageSurface(array(), 1, 1);
+    new Cairo\Surface\Image(array(), 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    new CairoImageSurface(CairoFormat::ARGB32, array(), 1);
+    new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 3 */
 try {
-    new CairoImageSurface(CairoFormat::ARGB32, 1, array());
+    new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoImageSurface::__construct() expects exactly 3 parameters, 0 given
-CairoImageSurface::__construct() expects exactly 3 parameters, 1 given
-CairoImageSurface::__construct() expects exactly 3 parameters, 2 given
-CairoImageSurface::__construct() expects exactly 3 parameters, 4 given
-CairoImageSurface::__construct() expects parameter 1 to be long, array given
-CairoImageSurface::__construct() expects parameter 2 to be long, array given
-CairoImageSurface::__construct() expects parameter 3 to be long, array given
\ No newline at end of file
+Cairo\Surface\Image::__construct() expects exactly 3 parameters, 0 given
+Cairo\Surface\Image::__construct() expects exactly 3 parameters, 1 given
+Cairo\Surface\Image::__construct() expects exactly 3 parameters, 2 given
+Cairo\Surface\Image::__construct() expects exactly 3 parameters, 4 given
+Cairo\Surface\Image::__construct() expects parameter 1 to be int, array given
+Cairo\Surface\Image::__construct() expects parameter 2 to be int, array given
+Cairo\Surface\Image::__construct() expects parameter 3 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_format_stride_for_width.phpt b/tests/CairoSurface/CairoImageSurface/cairo_format_stride_for_width.phpt
deleted file mode 100644
index 65ca97f6..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_format_stride_for_width.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-cairo_format_stride_for_width() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_format_stride_for_width')) die('skip - cairo_format_stride_for_width not available');
-?>
---FILE--
-<?php
-echo cairo_format_stride_for_width(1, 5), PHP_EOL;
-
-/* Wrong number args */
-cairo_format_stride_for_width();
-
-/* Wrong number args 2 */
-cairo_format_stride_for_width(1);
-
-/* Wrong number args 3 */
-cairo_format_stride_for_width(1, 1, 1);
-
-/* Wrong arg type */
-cairo_format_stride_for_width(array(), 1);
-
-/* Wrong arg type */
-cairo_format_stride_for_width(1, array());
-?>
---EXPECTF--
-20
-
-Warning: cairo_format_stride_for_width() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_format_stride_for_width() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_format_stride_for_width() expects exactly 2 parameters, 3 given in %s on line %d
-
-Warning: cairo_format_stride_for_width() expects parameter 1 to be long, array given in %s on line %d
-
-Warning: cairo_format_stride_for_width() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create.phpt
deleted file mode 100644
index 40697816..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_image_surface_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-/* Wrong number args - 1 */
-cairo_image_surface_create();
-
-/* Wrong number args - 2 */
-cairo_image_surface_create(CAIRO_FORMAT_ARGB32);
-
-/* Wrong number args - 3 */
-cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1);
-
-/* Wrong number args - 4 */
-cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1, 1);
-
-/* Wrong arg type 1 */
-cairo_image_surface_create(array(), 1, 1);
-
-/* Wrong arg type 2 */
-cairo_image_surface_create(CAIRO_FORMAT_ARGB32, array(), 1);
-
-/* Wrong arg type 3 */
-cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_image_surface_create() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_image_surface_create() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_image_surface_create() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_image_surface_create() expects exactly 3 parameters, 4 given in %s on line %d
-
-Warning: cairo_image_surface_create() expects parameter 1 to be long, array given in %s on line %d
-
-Warning: cairo_image_surface_create() expects parameter 2 to be long, array given in %s on line %d
-
-Warning: cairo_image_surface_create() expects parameter 3 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_for_data.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_for_data.phpt
deleted file mode 100644
index 10e9e6d5..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_for_data.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-cairo_image_surface_create_for_data() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-/* Wrong number args - 1 */
-cairo_image_surface_create_for_data();
-
-/* Wrong number args - 2 */
-cairo_image_surface_create_for_data('');
-
-/* Wrong number args - 3 */
-cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32);
-
-/* Wrong number args - 4 */
-cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32, 1);
-
-/* Wrong number args - 5 */
-cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32, 1, 1, 1);
-
-/* Wrong arg type 1 */
-cairo_image_surface_create_for_data(array(), 1, 1, 1);
-
-/* Wrong arg type 2 */
-cairo_image_surface_create_for_data('', array(), 1, 1);
-
-/* Wrong arg type 3 */
-cairo_image_surface_create_for_data('', 1, array(), 1);
-
-/* Wrong arg type 4 */
-cairo_image_surface_create_for_data('', 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 0 given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 1 given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 2 given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 3 given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 5 given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects parameter 1 to be string, array given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects parameter 2 to be long, array given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects parameter 3 to be long, array given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects parameter 4 to be long, array given in %s on line %d
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_from_png.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_from_png.phpt
deleted file mode 100644
index c3d506fe..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_from_png.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-cairo_image_surface_create_from_png() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PNG', cairo_available_surfaces())) die('skip - PNG support not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create_from_png(dirname(__FILE__) . '/red.png');
-var_dump($surface);
-
-$resource = fopen(dirname(__FILE__) . '/red.png', 'rw');
-$surface = cairo_image_surface_create_from_png($resource);
-var_dump($surface);
-fclose($resource);
-
-cairo_image_surface_create_from_png();
-cairo_image_surface_create_from_png('', 1);
-
-cairo_image_surface_create_from_png(array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_image_surface_create_from_png() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_image_surface_create_from_png() expects exactly 1 parameter, 2 given in %s on line %d
-
-Warning: cairo_image_surface_create_from_png() expects parameter 1 to be a string or a stream resource in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_data.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_data.phpt
deleted file mode 100644
index f157695a..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_data.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_image_surface_get_format() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(strlen(cairo_image_surface_get_data($surface)));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_image_surface_get_data();
-cairo_image_surface_get_data($surface, 1);
-
-// check arg types, should be an image surface object
-cairo_image_surface_get_data(null);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(10000)
-
-Warning: cairo_image_surface_get_data() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_image_surface_get_data() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_image_surface_get_data() must be an instance of CairoImageSurface, null given
-
-Warning: cairo_image_surface_get_data() expects parameter 1 to be CairoImageSurface, null given in %s on line %d
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_format.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_format.phpt
deleted file mode 100644
index 1b249e31..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_format.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_image_surface_get_format() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_image_surface_get_format($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_image_surface_get_format();
-cairo_image_surface_get_format($surface, 1);
-
-// check arg types, should be an image surface object
-cairo_image_surface_get_format(null);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(0)
-
-Warning: cairo_image_surface_get_format() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_image_surface_get_format() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_image_surface_get_format() must be an instance of CairoImageSurface, null given
-
-Warning: cairo_image_surface_get_format() expects parameter 1 to be CairoImageSurface, null given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_height.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_height.phpt
deleted file mode 100644
index 5b34b6b8..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_height.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_image_surface_get_height() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_image_surface_get_height($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_image_surface_get_height();
-cairo_image_surface_get_height($surface, 1);
-
-// check arg types, should be an image surface object
-cairo_image_surface_get_height(null);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(50)
-
-Warning: cairo_image_surface_get_height() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_image_surface_get_height() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_image_surface_get_height() must be an instance of CairoImageSurface, null given
-
-Warning: cairo_image_surface_get_height() expects parameter 1 to be CairoImageSurface, null given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_stride.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_stride.phpt
deleted file mode 100644
index dc36efa2..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_stride.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_image_surface_get_stride() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_image_surface_get_stride($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_image_surface_get_stride();
-cairo_image_surface_get_stride($surface, 1);
-
-// check arg types, should be an image surface object
-cairo_image_surface_get_stride(null);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(200)
-
-Warning: cairo_image_surface_get_stride() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_image_surface_get_stride() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_image_surface_get_stride() must be an instance of CairoImageSurface, null given
-
-Warning: cairo_image_surface_get_stride() expects parameter 1 to be CairoImageSurface, null given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_width.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_width.phpt
deleted file mode 100644
index 28e7c491..00000000
--- a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_get_width.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_image_surface_get_width() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_image_surface_get_width($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_image_surface_get_width();
-cairo_image_surface_get_width($surface, 1);
-
-// check arg types, should be an image surface object
-cairo_image_surface_get_width(null);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(50)
-
-Warning: cairo_image_surface_get_width() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_image_surface_get_width() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_image_surface_get_width() must be an instance of CairoImageSurface, null given
-
-Warning: cairo_image_surface_get_width() expects parameter 1 to be CairoImageSurface, null given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/createForData.phpt b/tests/CairoSurface/CairoImageSurface/createForData.phpt
index 1d3bb42a..627d92ca 100644
--- a/tests/CairoSurface/CairoImageSurface/createForData.phpt
+++ b/tests/CairoSurface/CairoImageSurface/createForData.phpt
@@ -1,95 +1,95 @@
 --TEST--
-CairoImageSurface::createForData() method
+Cairo\Surface\Image::createForData() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = CairoImageSurface::createForData('', CairoFormat::ARGB32, 50, 50);
+$surface = Cairo\Surface\Image::createForData('', Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 /* Wrong number args - 1 */
 try {
-    CairoImageSurface::createForData();
+    Cairo\Surface\Image::createForData();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    CairoImageSurface::createForData('');
+    Cairo\Surface\Image::createForData('');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 3 */
 try {
-    CairoImageSurface::createForData('', CairoFormat::ARGB32);
+    Cairo\Surface\Image::createForData('', Cairo\Surface\ImageFormat::ARGB32);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    CairoImageSurface::createForData('', CairoFormat::ARGB32, 1);
+    Cairo\Surface\Image::createForData('', Cairo\Surface\ImageFormat::ARGB32, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 5 */
 try {
-    CairoImageSurface::createForData('', CairoFormat::ARGB32, 1, 1, 1);
+    Cairo\Surface\Image::createForData('', Cairo\Surface\ImageFormat::ARGB32, 1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    CairoImageSurface::createForData(array(), 1, 1, 1);
+    Cairo\Surface\Image::createForData(array(), 1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    CairoImageSurface::createForData('', array(), 1, 1);
+    Cairo\Surface\Image::createForData('', array(), 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 3 */
 try {
-    CairoImageSurface::createForData('', 1, array(), 1);
+    Cairo\Surface\Image::createForData('', 1, array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 4 */
 try {
-    CairoImageSurface::createForData('', 1, 1, array());
+    Cairo\Surface\Image::createForData('', 1, 1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoImageSurface::createForData() expects exactly 4 parameters, 0 given
-CairoImageSurface::createForData() expects exactly 4 parameters, 1 given
-CairoImageSurface::createForData() expects exactly 4 parameters, 2 given
-CairoImageSurface::createForData() expects exactly 4 parameters, 3 given
-CairoImageSurface::createForData() expects exactly 4 parameters, 5 given
-CairoImageSurface::createForData() expects parameter 1 to be string, array given
-CairoImageSurface::createForData() expects parameter 2 to be long, array given
-CairoImageSurface::createForData() expects parameter 3 to be long, array given
-CairoImageSurface::createForData() expects parameter 4 to be long, array given
+Cairo\Surface\Image::createForData() expects exactly 4 parameters, 0 given
+Cairo\Surface\Image::createForData() expects exactly 4 parameters, 1 given
+Cairo\Surface\Image::createForData() expects exactly 4 parameters, 2 given
+Cairo\Surface\Image::createForData() expects exactly 4 parameters, 3 given
+Cairo\Surface\Image::createForData() expects exactly 4 parameters, 5 given
+Cairo\Surface\Image::createForData() expects parameter 1 to be string, array given
+Cairo\Surface\Image::createForData() expects parameter 2 to be int, array given
+Cairo\Surface\Image::createForData() expects parameter 3 to be int, array given
+Cairo\Surface\Image::createForData() expects parameter 4 to be int, array given
diff --git a/tests/CairoSurface/CairoImageSurface/createFromPng.phpt b/tests/CairoSurface/CairoImageSurface/createFromPng.phpt
index b1810a48..db27296a 100644
--- a/tests/CairoSurface/CairoImageSurface/createFromPng.phpt
+++ b/tests/CairoSurface/CairoImageSurface/createFromPng.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoImageSurface::createFromPng() method
+Cairo\Surface\Image::createFromPng() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,43 +7,43 @@ if(!in_array('PNG', Cairo::availableSurfaces())) die('skip - PNG support not ava
 ?>
 --FILE--
 <?php
-$surface = CairoImageSurface::createFromPng(dirname(__FILE__) . '/red.png');
+$surface = Cairo\Surface\Image::createFromPng(dirname(__FILE__) . '/red.png');
 var_dump($surface);
 
 $resource = fopen(dirname(__FILE__) . '/red.png', 'rw');
-$surface = CairoImageSurface::createFromPng($resource);
+$surface = Cairo\Surface\Image::createFromPng($resource);
 var_dump($surface);
 fclose($resource);
 
 /* Wrong number args - 1 */
 try {
-    CairoImageSurface::createFromPng();
+    Cairo\Surface\Image::createFromPng();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    CairoImageSurface::createFromPng('', 1);
+    Cairo\Surface\Image::createFromPng('', 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg */
 try {
-    CairoImageSurface::createFromPng(array());
+    Cairo\Surface\Image::createFromPng(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (Cairo\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoImageSurface::createFromPng() expects exactly 1 parameter, 0 given
-CairoImageSurface::createFromPng() expects exactly 1 parameter, 2 given
-CairoImageSurface::createFromPng() expects parameter 1 to be a string or a stream resource
\ No newline at end of file
+Cairo\Surface\Image::createFromPng() expects exactly 1 parameter, 0 given
+Cairo\Surface\Image::createFromPng() expects exactly 1 parameter, 2 given
+Cairo\Surface\Image::createFromPng() expects parameter 1 to be a string or a stream resource
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/getData.phpt b/tests/CairoSurface/CairoImageSurface/getData.phpt
index 17507fda..b0e10a2a 100644
--- a/tests/CairoSurface/CairoImageSurface/getData.phpt
+++ b/tests/CairoSurface/CairoImageSurface/getData.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoImageSurface->getData() method
+Cairo\Surface\Image->getData() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump(strlen($surface->getData()));
@@ -15,12 +15,12 @@ var_dump(strlen($surface->getData()));
 try {
     $surface->getData('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(10000)
-CairoImageSurface::getData() expects exactly 0 parameters, 1 given
+long(10000)
+Cairo\Surface\Image::getData() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoSurface/CairoImageSurface/getFormat.phpt b/tests/CairoSurface/CairoImageSurface/getFormat.phpt
index fa7f31cc..cd88c252 100644
--- a/tests/CairoSurface/CairoImageSurface/getFormat.phpt
+++ b/tests/CairoSurface/CairoImageSurface/getFormat.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoImageSurface->getFormat() method
+Cairo\Surface\Image->getFormat() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getFormat());
@@ -15,12 +15,12 @@ var_dump($surface->getFormat());
 try {
     $surface->getFormat('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(0)
-CairoImageSurface::getFormat() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\Surface\Image::getFormat() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/getHeight.phpt b/tests/CairoSurface/CairoImageSurface/getHeight.phpt
index 1db1cb8f..0a66d0b7 100644
--- a/tests/CairoSurface/CairoImageSurface/getHeight.phpt
+++ b/tests/CairoSurface/CairoImageSurface/getHeight.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoImageSurface->getHeight() method
+Cairo\Surface\Image->getHeight() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getHeight());
@@ -15,12 +15,12 @@ var_dump($surface->getHeight());
 try {
     $surface->getHeight('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(50)
-CairoImageSurface::getHeight() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(50)
+Cairo\Surface\Image::getHeight() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/getStride.phpt b/tests/CairoSurface/CairoImageSurface/getStride.phpt
index 95bdc7a2..69640fc7 100644
--- a/tests/CairoSurface/CairoImageSurface/getStride.phpt
+++ b/tests/CairoSurface/CairoImageSurface/getStride.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoImageSurface->getStride() method
+Cairo\Surface\Image->getStride() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getStride());
@@ -15,12 +15,12 @@ var_dump($surface->getStride());
 try {
     $surface->getStride('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(200)
-CairoImageSurface::getStride() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(200)
+Cairo\Surface\Image::getStride() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoImageSurface/getWidth.phpt b/tests/CairoSurface/CairoImageSurface/getWidth.phpt
index 8c15c1df..b88c3edd 100644
--- a/tests/CairoSurface/CairoImageSurface/getWidth.phpt
+++ b/tests/CairoSurface/CairoImageSurface/getWidth.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoImageSurface->getWidth() method
+Cairo\Surface\Image->getWidth() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getWidth());
@@ -15,12 +15,12 @@ var_dump($surface->getWidth());
 try {
     $surface->getWidth('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(50)
-CairoImageSurface::getWidth() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(50)
+Cairo\Surface\Image::getWidth() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPdfSurface/__construct.phpt b/tests/CairoSurface/CairoPdfSurface/__construct.phpt
index 1eb76858..31328bc4 100644
--- a/tests/CairoSurface/CairoPdfSurface/__construct.phpt
+++ b/tests/CairoSurface/CairoPdfSurface/__construct.phpt
@@ -1,5 +1,5 @@
 --TEST--
-new CairoPdfSurface [__construct() method ]
+new Cairo\Surface\Pdf [__construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,69 +7,69 @@ if(!in_array('PDF', Cairo::availableSurfaces())) die('skip - PDF surface not ava
 ?>
 --FILE--
 <?php
-$surface = new CairoPdfSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Pdf(NULL, 50, 50);
 var_dump($surface);
 
-$surface = new CairoPdfSurface(dirname(__FILE__) . '/nametest.pdf', 50, 50);
+$surface = new Cairo\Surface\Pdf(dirname(__FILE__) . '/nametest.pdf', 50, 50);
 var_dump($surface);
 
 $fp = fopen(dirname(__FILE__) . '/streamtest.pdf', 'wb');
-$surface = new CairoPdfSurface($fp, 50, 50);
+$surface = new Cairo\Surface\Pdf($fp, 50, 50);
 var_dump($surface);
 
 /* Wrong number args - 1 */
 try {
-    new CairoPdfSurface();
+    new Cairo\Surface\Pdf();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    new CairoPdfSurface(NULL);
+    new Cairo\Surface\Pdf(NULL);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 3 */
 try {
-    new CairoPdfSurface(NULL, 1);
+    new Cairo\Surface\Pdf(NULL, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    new CairoPdfSurface(NULL, 1, 1, 1);
+    new Cairo\Surface\Pdf(NULL, 1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    new CairoPdfSurface(array(), 1, 1);
+    new Cairo\Surface\Pdf(array(), 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (Cairo\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    new CairoPdfSurface(NULL, array(), 1);
+    new Cairo\Surface\Pdf(NULL, array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 3 */
 try {
-    new CairoPdfSurface(NULL, 1, array());
+    new Cairo\Surface\Pdf(NULL, 1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
@@ -79,16 +79,16 @@ unlink(dirname(__FILE__) . '/nametest.pdf');
 unlink(dirname(__FILE__) . '/streamtest.pdf');
 ?>
 --EXPECTF--
-object(CairoPdfSurface)#%d (0) {
+object(Cairo\Surface\Pdf)#%d (0) {
 }
-object(CairoPdfSurface)#%d (0) {
+object(Cairo\Surface\Pdf)#%d (0) {
 }
-object(CairoPdfSurface)#%d (0) {
+object(Cairo\Surface\Pdf)#%d (0) {
 }
-CairoPdfSurface::__construct() expects exactly 3 parameters, 0 given
-CairoPdfSurface::__construct() expects exactly 3 parameters, 1 given
-CairoPdfSurface::__construct() expects exactly 3 parameters, 2 given
-CairoPdfSurface::__construct() expects exactly 3 parameters, 4 given
-CairoPdfSurface::__construct() expects parameter 1 to be null, a string, or a stream resource
-CairoPdfSurface::__construct() expects parameter 2 to be double, array given
-CairoPdfSurface::__construct() expects parameter 3 to be double, array given
\ No newline at end of file
+Cairo\Surface\Pdf::__construct() expects exactly 3 parameters, 0 given
+Cairo\Surface\Pdf::__construct() expects exactly 3 parameters, 1 given
+Cairo\Surface\Pdf::__construct() expects exactly 3 parameters, 2 given
+Cairo\Surface\Pdf::__construct() expects exactly 3 parameters, 4 given
+Cairo\Surface\Pdf::__construct() expects parameter 1 to be null, a string, or a stream resource
+Cairo\Surface\Pdf::__construct() expects parameter 2 to be float, array given
+Cairo\Surface\Pdf::__construct() expects parameter 3 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPdfSurface/cairo_pdf_surface_create.phpt b/tests/CairoSurface/CairoPdfSurface/cairo_pdf_surface_create.phpt
deleted file mode 100644
index 011d43bd..00000000
--- a/tests/CairoSurface/CairoPdfSurface/cairo_pdf_surface_create.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-cairo_pdf_surface_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PDF', cairo_available_surfaces())) die('skip - PDF surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_pdf_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-$surface = cairo_pdf_surface_create(dirname(__FILE__) . '/nametest.pdf', 50, 50);
-var_dump($surface);
-
-$fp = fopen(dirname(__FILE__) . '/streamtest.pdf', 'wb');
-$surface = cairo_pdf_surface_create($fp, 50, 50);
-var_dump($surface);
-
-// check number of args - should accept ONLY 3
-cairo_pdf_surface_create();
-cairo_pdf_surface_create(NULL);
-cairo_pdf_surface_create(NULL, 1);
-cairo_pdf_surface_create(NULL, 1, 1, 1);
-
-// check arg types, should be null, string(filename) or stream, int, int
-cairo_pdf_surface_create(1, 1, 1);
-cairo_pdf_surface_create(NULL, array(), 1);
-cairo_pdf_surface_create(NULL, 1, array());
-?>
---CLEAN--
-<?php
-unlink(dirname(__FILE__) . '/nametest.pdf');
-unlink(dirname(__FILE__) . '/streamtest.pdf');
-?>
---EXPECTF--
-object(CairoPdfSurface)#%d (0) {
-}
-object(CairoPdfSurface)#%d (0) {
-}
-object(CairoPdfSurface)#%d (0) {
-}
-
-Warning: cairo_pdf_surface_create() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_pdf_surface_create() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_pdf_surface_create() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_pdf_surface_create() expects exactly 3 parameters, 4 given in %s on line %d
-
-Warning: cairo_pdf_surface_create() expects parameter 1 to be null, a string, or a stream resource in %s on line %d
-
-Warning: cairo_pdf_surface_create() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_pdf_surface_create() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPdfSurface/cairo_pdf_surface_set_size.phpt b/tests/CairoSurface/CairoPdfSurface/cairo_pdf_surface_set_size.phpt
deleted file mode 100644
index 3fbb3343..00000000
--- a/tests/CairoSurface/CairoPdfSurface/cairo_pdf_surface_set_size.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_pdf_surface_set_size() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PDF', cairo_available_surfaces())) die('skip - PDF surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_pdf_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_pdf_surface_set_size($surface, 10, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 3
-cairo_pdf_surface_set_size();
-cairo_pdf_surface_set_size($surface);
-cairo_pdf_surface_set_size($surface, 1);
-cairo_pdf_surface_set_size($surface, 1, 1, 1);
-
-// check arg types, should be pdf surface object, int, int
-cairo_pdf_surface_set_size(1, 1, 1);
-cairo_pdf_surface_set_size($surface, array(), 1);
-cairo_pdf_surface_set_size($surface, 1, array());
-?>
---EXPECTF--
-object(CairoPdfSurface)#%d (0) {
-}
-
-Warning: cairo_pdf_surface_set_size() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_pdf_surface_set_size() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_pdf_surface_set_size() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_pdf_surface_set_size() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_pdf_surface_set_size() must be an instance of CairoPdfSurface, integer given
-
-Warning: cairo_pdf_surface_set_size() expects parameter 1 to be CairoPdfSurface, integer given in %s on line %d
-
-Warning: cairo_pdf_surface_set_size() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_pdf_surface_set_size() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPdfSurface/setSize.phpt b/tests/CairoSurface/CairoPdfSurface/setSize.phpt
index 1f5adaab..7579ad84 100644
--- a/tests/CairoSurface/CairoPdfSurface/setSize.phpt
+++ b/tests/CairoSurface/CairoPdfSurface/setSize.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoPdfSurface->setSize() method
+Cairo\Surface\Pdf->setSize() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,7 +7,7 @@ if(!in_array('PDF', Cairo::availableSurfaces())) die('skip - PDF surface not ava
 ?>
 --FILE--
 <?php
-$surface = new CairoPdfSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Pdf(NULL, 50, 50);
 var_dump($surface);
 
 $surface->setSize(10, 10);
@@ -16,7 +16,7 @@ $surface->setSize(10, 10);
 try {
     $surface->setSize();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -24,7 +24,7 @@ try {
 try {
     $surface->setSize(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
 try {
     $surface->setSize(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
 try {
     $surface->setSize(array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -48,15 +48,15 @@ try {
 try {
     $surface->setSize(1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPdfSurface)#%d (0) {
+object(Cairo\Surface\Pdf)#%d (0) {
 }
-CairoPdfSurface::setSize() expects exactly 2 parameters, 0 given
-CairoPdfSurface::setSize() expects exactly 2 parameters, 1 given
-CairoPdfSurface::setSize() expects exactly 2 parameters, 3 given
-CairoPdfSurface::setSize() expects parameter 1 to be double, array given
-CairoPdfSurface::setSize() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Surface\Pdf::setSize() expects exactly 2 parameters, 0 given
+Cairo\Surface\Pdf::setSize() expects exactly 2 parameters, 1 given
+Cairo\Surface\Pdf::setSize() expects exactly 2 parameters, 3 given
+Cairo\Surface\Pdf::setSize() expects parameter 1 to be float, array given
+Cairo\Surface\Pdf::setSize() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/CairoPsLevel_constants.phpt b/tests/CairoSurface/CairoPsSurface/CairoPsLevel_constants.phpt
index 3e95287f..b0e19d41 100644
--- a/tests/CairoSurface/CairoPsSurface/CairoPsLevel_constants.phpt
+++ b/tests/CairoSurface/CairoPsSurface/CairoPsLevel_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoPsLevel class constants
+Cairo\Surface\Ps\Level class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -14,7 +14,7 @@ $constants = array(
 
 $error = false;
 foreach($constants as $name) {
-	$constant = 'CairoPsLevel::' . $name;
+	$constant = 'Cairo\Surface\Ps\Level::' . $name;
 	if (!defined($constant)) {
 		$error = true;
 		echo 'Missing Constant: ' . $constant . "\n";
diff --git a/tests/CairoSurface/CairoPsSurface/__construct.phpt b/tests/CairoSurface/CairoPsSurface/__construct.phpt
index 347247ca..b8c4305b 100644
--- a/tests/CairoSurface/CairoPsSurface/__construct.phpt
+++ b/tests/CairoSurface/CairoPsSurface/__construct.phpt
@@ -1,5 +1,5 @@
 --TEST--
-new CairoPsSurface [__construct() method ]
+new Cairo\Surface\Ps [__construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,69 +7,69 @@ if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not avail
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
-$surface = new CairoPsSurface(dirname(__FILE__) . '/nametest.ps', 50, 50);
+$surface = new Cairo\Surface\Ps(dirname(__FILE__) . '/nametest.ps', 50, 50);
 var_dump($surface);
 
 $fp = fopen(dirname(__FILE__) . '/streamtest.ps', 'wb');
-$surface = new CairoPsSurface($fp, 50, 50);
+$surface = new Cairo\Surface\Ps($fp, 50, 50);
 var_dump($surface);
 
 /* Wrong number args - 1 */
 try {
-    new CairoPsSurface();
+    new Cairo\Surface\Ps();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    new CairoPsSurface(NULL);
+    new Cairo\Surface\Ps(NULL);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 3 */
 try {
-    new CairoPsSurface(NULL, 1);
+    new Cairo\Surface\Ps(NULL, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    new CairoPsSurface(NULL, 1, 1, 1);
+    new Cairo\Surface\Ps(NULL, 1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    new CairoPsSurface(array(), 1, 1);
+    new Cairo\Surface\Ps(array(), 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    new CairoPsSurface(NULL, array(), 1);
+    new Cairo\Surface\Ps(NULL, array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 3 */
 try {
-    new CairoPsSurface(NULL, 1, array());
+    new Cairo\Surface\Ps(NULL, 1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
@@ -79,16 +79,16 @@ unlink(dirname(__FILE__) . '/nametest.ps');
 unlink(dirname(__FILE__) . '/streamtest.ps');
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-CairoPsSurface::__construct() expects exactly 3 parameters, 0 given
-CairoPsSurface::__construct() expects exactly 3 parameters, 1 given
-CairoPsSurface::__construct() expects exactly 3 parameters, 2 given
-CairoPsSurface::__construct() expects exactly 3 parameters, 4 given
-CairoPsSurface::__construct() expects parameter 1 to be null, a string, or a stream resource
-CairoPsSurface::__construct() expects parameter 2 to be double, array given
-CairoPsSurface::__construct() expects parameter 3 to be double, array given
\ No newline at end of file
+Cairo\Surface\Ps::__construct() expects exactly 3 parameters, 0 given
+Cairo\Surface\Ps::__construct() expects exactly 3 parameters, 1 given
+Cairo\Surface\Ps::__construct() expects exactly 3 parameters, 2 given
+Cairo\Surface\Ps::__construct() expects exactly 3 parameters, 4 given
+Cairo\Surface\Ps::__construct() expects parameter 1 to be null, a string, or a stream resource
+Cairo\Surface\Ps::__construct() expects parameter 2 to be float, array given
+Cairo\Surface\Ps::__construct() expects parameter 3 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_get_levels.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_get_levels.phpt
deleted file mode 100644
index f0bef92c..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_get_levels.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-cairo_ps_get_levels() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-if(!function_exists('cairo_ps_get_levels')) die('skip - cairo_ps_get_levels not available');
-?>
---FILE--
-<?php
-var_dump(cairo_ps_get_levels());
-
-cairo_ps_get_levels('foo');
-?>
---EXPECTF--
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
-Warning: cairo_ps_get_levels() expects exactly 0 parameters, 1 given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_level_to_string.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_level_to_string.phpt
deleted file mode 100644
index 33687400..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_level_to_string.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-cairo_ps_level_to_string() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-if(!function_exists('cairo_ps_level_to_string')) die('skip - cairo_ps_level_to_string not available');
-?>
---FILE--
-<?php
-echo cairo_ps_level_to_string(CAIRO_PS_LEVEL_2), PHP_EOL;
-
-// check number of args - should accept ONLY 1
-cairo_ps_level_to_string();
-cairo_ps_level_to_string(1, 1);
-
-// check arg types, should be int
-cairo_ps_level_to_string(array());
-?>
---EXPECTF--
-PS Level 2
-
-Warning: cairo_ps_level_to_string() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_ps_level_to_string() expects exactly 1 parameter, 2 given in %s on line %d
-
-Warning: cairo_ps_level_to_string() expects parameter 1 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_create.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_create.phpt
deleted file mode 100644
index 3cabbd17..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_create.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-cairo_ps_surface_create() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-$surface = cairo_ps_surface_create(dirname(__FILE__) . '/nametest.ps', 50, 50);
-var_dump($surface);
-
-$fp = fopen(dirname(__FILE__) . '/streamtest.ps', 'wb');
-$surface = cairo_ps_surface_create($fp, 50, 50);
-var_dump($surface);
-
-// check number of args - should accept ONLY 3
-cairo_ps_surface_create();
-cairo_ps_surface_create(NULL);
-cairo_ps_surface_create(NULL, 1);
-cairo_ps_surface_create(NULL, 1, 1, 1);
-
-// check arg types, should be null, string(filename) or stream, int, int
-cairo_ps_surface_create(1, 1, 1);
-cairo_ps_surface_create(NULL, array(), 1);
-cairo_ps_surface_create(NULL, 1, array());
-?>
---CLEAN--
-<?php
-unlink(dirname(__FILE__) . '/nametest.ps');
-unlink(dirname(__FILE__) . '/streamtest.ps');
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-object(CairoPsSurface)#%d (0) {
-}
-object(CairoPsSurface)#%d (0) {
-}
-
-Warning: cairo_ps_surface_create() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_create() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_ps_surface_create() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_ps_surface_create() expects exactly 3 parameters, 4 given in %s on line %d
-
-Warning: cairo_ps_surface_create() expects parameter 1 to be null, a string, or a stream resource in %s on line %d
-
-Warning: cairo_ps_surface_create() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_ps_surface_create() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_begin_page_setup.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_begin_page_setup.phpt
deleted file mode 100644
index 64f7aec7..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_begin_page_setup.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_ps_surface_dsc_begin_page_setup() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_ps_surface_dsc_begin_page_setup($surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_ps_surface_dsc_begin_page_setup();
-cairo_ps_surface_dsc_begin_page_setup($surface, 1);
-
-// check arg types, should be ps surface object
-cairo_ps_surface_dsc_begin_page_setup(null);
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-
-Warning: cairo_ps_surface_dsc_begin_page_setup() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_dsc_begin_page_setup() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_ps_surface_dsc_begin_page_setup() must be an instance of CairoPsSurface, null given
-
-Warning: cairo_ps_surface_dsc_begin_page_setup() expects parameter 1 to be CairoPsSurface, null given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_begin_setup.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_begin_setup.phpt
deleted file mode 100644
index c1186345..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_begin_setup.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_ps_surface_dsc_begin_setup() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_ps_surface_dsc_begin_setup($surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_ps_surface_dsc_begin_setup();
-cairo_ps_surface_dsc_begin_setup($surface, 1);
-
-// check arg types, should be ps surface object
-cairo_ps_surface_dsc_begin_setup(null);
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-
-Warning: cairo_ps_surface_dsc_begin_setup() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_dsc_begin_setup() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_ps_surface_dsc_begin_setup() must be an instance of CairoPsSurface, null given
-
-Warning: cairo_ps_surface_dsc_begin_setup() expects parameter 1 to be CairoPsSurface, null given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_comment.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_comment.phpt
deleted file mode 100644
index 5bd8ff42..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_dsc_comment.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-cairo_ps_surface_dsc_comment() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_ps_surface_dsc_comment($surface, '%%Title: My excellent document');
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_ps_surface_dsc_comment();
-cairo_ps_surface_dsc_comment($surface);
-cairo_ps_surface_dsc_comment($surface, 1, 1);
-
-// check arg types, should be ps surface object, boolean
-cairo_ps_surface_dsc_comment(1, 1);
-cairo_ps_surface_dsc_comment($surface, array());
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-
-Warning: cairo_ps_surface_dsc_comment() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_dsc_comment() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_ps_surface_dsc_comment() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_ps_surface_dsc_comment() must be an instance of CairoPsSurface, integer given
-
-Warning: cairo_ps_surface_dsc_comment() expects parameter 1 to be CairoPsSurface, integer given in %s on line %d
-
-Warning: cairo_ps_surface_dsc_comment() expects parameter 2 to be string, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_get_eps.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_get_eps.phpt
deleted file mode 100644
index e3c57f20..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_get_eps.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-cairo_ps_surface_get_eps() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-if(!function_exists('cairo_ps_surface_get_eps')) die('skip - cairo_ps_surface_get_eps not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_ps_surface_get_eps($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_ps_surface_get_eps();
-cairo_ps_surface_get_eps($surface, 1);
-
-// check arg types, should be ps surface object
-cairo_ps_surface_get_eps(null);
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-bool(false)
-
-Warning: cairo_ps_surface_get_eps() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_get_eps() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_ps_surface_get_eps() must be an instance of CairoPsSurface, null given
-
-Warning: cairo_ps_surface_get_eps() expects parameter 1 to be CairoPsSurface, null given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_restrict_to_level.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_restrict_to_level.phpt
deleted file mode 100644
index 8e68e6ac..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_restrict_to_level.phpt
+++ /dev/null
@@ -1,44 +0,0 @@
---TEST--
-cairo_ps_surface_restrict_to_level() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-if(!function_exists('cairo_ps_surface_restrict_to_level')) die('skip - cairo_ps_surface_restrict_to_level not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_ps_surface_restrict_to_level($surface, CAIRO_PS_LEVEL_2);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_ps_surface_restrict_to_level();
-cairo_ps_surface_restrict_to_level($surface);
-cairo_ps_surface_restrict_to_level($surface, 1, 1);
-
-// check arg types, should be ps surface object, int
-cairo_ps_surface_restrict_to_level(1, 1);
-cairo_ps_surface_restrict_to_level($surface, array());
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-
-Warning: cairo_ps_surface_restrict_to_level() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_restrict_to_level() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_ps_surface_restrict_to_level() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_ps_surface_restrict_to_level() must be an instance of CairoPsSurface, integer given
-
-Warning: cairo_ps_surface_restrict_to_level() expects parameter 1 to be CairoPsSurface, integer given in %s on line %d
-
-Warning: cairo_ps_surface_restrict_to_level() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_set_eps.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_set_eps.phpt
deleted file mode 100644
index 082c24da..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_set_eps.phpt
+++ /dev/null
@@ -1,44 +0,0 @@
---TEST--
-cairo_ps_surface_set_eps() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-if(!function_exists('cairo_ps_surface_set_eps')) die('skip - cairo_ps_surface_set_eps not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_ps_surface_set_eps($surface, true);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_ps_surface_set_eps();
-cairo_ps_surface_set_eps($surface);
-cairo_ps_surface_set_eps($surface, 1, 1);
-
-// check arg types, should be ps surface object, boolean
-cairo_ps_surface_set_eps(1, 1);
-cairo_ps_surface_set_eps($surface, array());
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-
-Warning: cairo_ps_surface_set_eps() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_set_eps() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_ps_surface_set_eps() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_ps_surface_set_eps() must be an instance of CairoPsSurface, integer given
-
-Warning: cairo_ps_surface_set_eps() expects parameter 1 to be CairoPsSurface, integer given in %s on line %d
-
-Warning: cairo_ps_surface_set_eps() expects parameter 2 to be boolean, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_set_size.phpt b/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_set_size.phpt
deleted file mode 100644
index 7210b60b..00000000
--- a/tests/CairoSurface/CairoPsSurface/cairo_ps_surface_set_size.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-cairo_ps_surface_set_size() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PS', cairo_available_surfaces())) die('skip - PS surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_ps_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_ps_surface_set_size($surface, 10, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 3
-cairo_ps_surface_set_size();
-cairo_ps_surface_set_size($surface);
-cairo_ps_surface_set_size($surface, 1);
-cairo_ps_surface_set_size($surface, 1, 1, 1);
-
-// check arg types, should be pdf surface object, int, int
-cairo_ps_surface_set_size(1, 1, 1);
-cairo_ps_surface_set_size($surface, array(), 1);
-cairo_ps_surface_set_size($surface, 1, array());
-?>
---EXPECTF--
-object(CairoPsSurface)#%d (0) {
-}
-
-Warning: cairo_ps_surface_set_size() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_ps_surface_set_size() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_ps_surface_set_size() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_ps_surface_set_size() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_ps_surface_set_size() must be an instance of CairoPsSurface, integer given
-
-Warning: cairo_ps_surface_set_size() expects parameter 1 to be CairoPsSurface, integer given in %s on line %d
-
-Warning: cairo_ps_surface_set_size() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_ps_surface_set_size() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/dscBeginPageSetup.phpt b/tests/CairoSurface/CairoPsSurface/dscBeginPageSetup.phpt
index a0e45a30..ca660435 100644
--- a/tests/CairoSurface/CairoPsSurface/dscBeginPageSetup.phpt
+++ b/tests/CairoSurface/CairoPsSurface/dscBeginPageSetup.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoPsSurface->dscBeginPageSetup() method
+Cairo\Surface\Ps->dscBeginPageSetup() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,7 +7,7 @@ if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not avail
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
 $surface->dscBeginPageSetup();
@@ -16,11 +16,11 @@ $surface->dscBeginPageSetup();
 try {
     $surface->dscBeginPageSetup('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-CairoPsSurface::dscBeginPageSetup() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface\Ps::dscBeginPageSetup() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/dscBeginSetup.phpt b/tests/CairoSurface/CairoPsSurface/dscBeginSetup.phpt
index 87075da2..ca46866a 100644
--- a/tests/CairoSurface/CairoPsSurface/dscBeginSetup.phpt
+++ b/tests/CairoSurface/CairoPsSurface/dscBeginSetup.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoPsSurface->dscBeginSetup() method
+Cairo\Surface\Ps->dscBeginSetup() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,7 +7,7 @@ if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not avail
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
 $surface->dscBeginSetup();
@@ -16,11 +16,11 @@ $surface->dscBeginSetup();
 try {
     $surface->dscBeginSetup('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-CairoPsSurface::dscBeginSetup() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface\Ps::dscBeginSetup() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/dscComment.phpt b/tests/CairoSurface/CairoPsSurface/dscComment.phpt
index ee91ec17..25240234 100644
--- a/tests/CairoSurface/CairoPsSurface/dscComment.phpt
+++ b/tests/CairoSurface/CairoPsSurface/dscComment.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoPsSurface->dscComment() method
+Cairo\Surface\Ps->dscComment() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,7 +7,7 @@ if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not avail
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
 $surface->dscComment('%%Title: My excellent document');
@@ -16,7 +16,7 @@ $surface->dscComment('%%Title: My excellent document');
 try {
     $surface->dscComment();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -24,7 +24,7 @@ try {
 try {
     $surface->dscComment(1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -32,13 +32,13 @@ try {
 try {
     $surface->dscComment(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-CairoPsSurface::dscComment() expects exactly 1 parameter, 0 given
-CairoPsSurface::dscComment() expects exactly 1 parameter, 2 given
-CairoPsSurface::dscComment() expects parameter 1 to be string, array given
\ No newline at end of file
+Cairo\Surface\Ps::dscComment() expects exactly 1 parameter, 0 given
+Cairo\Surface\Ps::dscComment() expects exactly 1 parameter, 2 given
+Cairo\Surface\Ps::dscComment() expects parameter 1 to be string, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/getEps.phpt b/tests/CairoSurface/CairoPsSurface/getEps.phpt
index 21b31e11..7d16df8c 100644
--- a/tests/CairoSurface/CairoPsSurface/getEps.phpt
+++ b/tests/CairoSurface/CairoPsSurface/getEps.phpt
@@ -1,14 +1,14 @@
 --TEST--
-CairoPsSurface->getEps() method
+Cairo\Surface\Ps->getEps() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not available');
-if(!method_exists('CairoPsSurface', 'getEps')) die('skip - CairoPsSurface->getEps not available');
+if(!method_exists('Cairo\Surface\Ps', 'getEps')) die('skip - Cairo\Surface\Ps->getEps not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getEps());
@@ -17,12 +17,12 @@ var_dump($surface->getEps());
 try {
     $surface->getEps('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
 bool(false)
-CairoPsSurface::getEps() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface\Ps::getEps() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/getLevels.phpt b/tests/CairoSurface/CairoPsSurface/getLevels.phpt
index 639f3f41..808990f9 100644
--- a/tests/CairoSurface/CairoPsSurface/getLevels.phpt
+++ b/tests/CairoSurface/CairoPsSurface/getLevels.phpt
@@ -1,29 +1,29 @@
 --TEST--
-CairoPsSurface::getLevels() method
+Cairo\Surface\Ps::getLevels() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not available');
-if(!method_exists('CairoPsSurface', 'getLevels')) die('skip - CairoPsSurface::getLevels not available');
+if(!method_exists('Cairo\Surface\Ps', 'getLevels')) die('skip - Cairo\Surface\Ps::getLevels not available');
 
 ?>
 --FILE--
 <?php
-var_dump(CairoPsSurface::getLevels());
+var_dump(Cairo\Surface\Ps::getLevels());
 
 /* Wrong number args */
 try {
-    CairoPsSurface::getLevels('foo');
+    Cairo\Surface\Ps::getLevels('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
 array(2) {
   [0]=>
-  int(0)
+  long(0)
   [1]=>
-  int(1)
+  long(1)
 }
-CairoPsSurface::getLevels() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface\Ps::getLevels() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/levelToString.phpt b/tests/CairoSurface/CairoPsSurface/levelToString.phpt
index 9c39fd43..e026ddc6 100644
--- a/tests/CairoSurface/CairoPsSurface/levelToString.phpt
+++ b/tests/CairoSurface/CairoPsSurface/levelToString.phpt
@@ -1,41 +1,41 @@
 --TEST--
-CairoPsSurface::levelToString() method
+Cairo\Surface\Ps::levelToString() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not available');
-if(!method_exists('CairoPsSurface', 'levelToString')) die('skip - CairoPsSurface::levelToString not available');
+if(!method_exists('Cairo\Surface\Ps', 'levelToString')) die('skip - Cairo\Surface\Ps::levelToString not available');
 ?>
 --FILE--
 <?php
-echo CairoPsSurface::levelToString(CairoPsLevel::LEVEL_2), PHP_EOL;
+echo Cairo\Surface\Ps::levelToString(Cairo\Surface\Ps\Level::LEVEL_2), PHP_EOL;
 
 /* Wrong number args */
 try {
-    CairoPsSurface::levelToString();
+    Cairo\Surface\Ps::levelToString();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 2 */
 try {
-    CairoPsSurface::levelToString(1, 1);
+    Cairo\Surface\Ps::levelToString(1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type */
 try {
-    CairoPsSurface::levelToString(array());
+    Cairo\Surface\Ps::levelToString(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
 PS Level 2
-CairoPsSurface::levelToString() expects exactly 1 parameter, 0 given
-CairoPsSurface::levelToString() expects exactly 1 parameter, 2 given
-CairoPsSurface::levelToString() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\Surface\Ps::levelToString() expects exactly 1 parameter, 0 given
+Cairo\Surface\Ps::levelToString() expects exactly 1 parameter, 2 given
+Cairo\Surface\Ps::levelToString() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/restrictToLevel.phpt b/tests/CairoSurface/CairoPsSurface/restrictToLevel.phpt
index bc59ccb9..3cc2d575 100644
--- a/tests/CairoSurface/CairoPsSurface/restrictToLevel.phpt
+++ b/tests/CairoSurface/CairoPsSurface/restrictToLevel.phpt
@@ -1,23 +1,23 @@
 --TEST--
-CairoPsSurface->restrictToLevel() method
+Cairo\Surface\Ps->restrictToLevel() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not available');
-if(!method_exists('CairoPsSurface', 'restrictToLevel')) die('skip - CairoPsSurface->restrictToLevel not available');
+if(!method_exists('Cairo\Surface\Ps', 'restrictToLevel')) die('skip - Cairo\Surface\Ps->restrictToLevel not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
-$surface->restrictToLevel(CairoPsLevel::LEVEL_2);
+$surface->restrictToLevel(Cairo\Surface\Ps\Level::LEVEL_2);
 
 /* Wrong number args */
 try {
     $surface->restrictToLevel();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -25,7 +25,7 @@ try {
 try {
     $surface->restrictToLevel(1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -33,13 +33,13 @@ try {
 try {
     $surface->restrictToLevel(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-CairoPsSurface::restrictToLevel() expects exactly 1 parameter, 0 given
-CairoPsSurface::restrictToLevel() expects exactly 1 parameter, 2 given
-CairoPsSurface::restrictToLevel() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\Surface\Ps::restrictToLevel() expects exactly 1 parameter, 0 given
+Cairo\Surface\Ps::restrictToLevel() expects exactly 1 parameter, 2 given
+Cairo\Surface\Ps::restrictToLevel() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/setEps.phpt b/tests/CairoSurface/CairoPsSurface/setEps.phpt
index d80f7b92..9662b4c9 100644
--- a/tests/CairoSurface/CairoPsSurface/setEps.phpt
+++ b/tests/CairoSurface/CairoPsSurface/setEps.phpt
@@ -1,14 +1,14 @@
 --TEST--
-CairoPsSurface->setEps() method
+Cairo\Surface\Ps->setEps() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not available');
-if(!method_exists('CairoPsSurface', 'setEps')) die('skip - CairoPsSurface->setEps not available');
+if(!method_exists('Cairo\Surface\Ps', 'setEps')) die('skip - Cairo\Surface\Ps->setEps not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
 $surface->setEps(true);
@@ -17,7 +17,7 @@ $surface->setEps(true);
 try {
     $surface->setEps();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -25,7 +25,7 @@ try {
 try {
     $surface->setEps(1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -33,13 +33,13 @@ try {
 try {
     $surface->setEps(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-CairoPsSurface::setEps() expects exactly 1 parameter, 0 given
-CairoPsSurface::setEps() expects exactly 1 parameter, 2 given
-CairoPsSurface::setEps() expects parameter 1 to be boolean, array given
\ No newline at end of file
+Cairo\Surface\Ps::setEps() expects exactly 1 parameter, 0 given
+Cairo\Surface\Ps::setEps() expects exactly 1 parameter, 2 given
+Cairo\Surface\Ps::setEps() expects parameter 1 to be boolean, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoPsSurface/setSize.phpt b/tests/CairoSurface/CairoPsSurface/setSize.phpt
index 110f00fe..21002b50 100644
--- a/tests/CairoSurface/CairoPsSurface/setSize.phpt
+++ b/tests/CairoSurface/CairoPsSurface/setSize.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoPsSurface->setSize() method
+Cairo\Surface\Ps->setSize() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,7 +7,7 @@ if(!in_array('PS', Cairo::availableSurfaces())) die('skip - PS surface not avail
 ?>
 --FILE--
 <?php
-$surface = new CairoPsSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Ps(NULL, 50, 50);
 var_dump($surface);
 
 $surface->setSize(10, 10);
@@ -16,7 +16,7 @@ $surface->setSize(10, 10);
 try {
     $surface->setSize();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -24,7 +24,7 @@ try {
 try {
     $surface->setSize(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -32,7 +32,7 @@ try {
 try {
     $surface->setSize(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -40,7 +40,7 @@ try {
 try {
     $surface->setSize(array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -48,15 +48,15 @@ try {
 try {
     $surface->setSize(1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoPsSurface)#%d (0) {
+object(Cairo\Surface\Ps)#%d (0) {
 }
-CairoPsSurface::setSize() expects exactly 2 parameters, 0 given
-CairoPsSurface::setSize() expects exactly 2 parameters, 1 given
-CairoPsSurface::setSize() expects exactly 2 parameters, 3 given
-CairoPsSurface::setSize() expects parameter 1 to be double, array given
-CairoPsSurface::setSize() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Surface\Ps::setSize() expects exactly 2 parameters, 0 given
+Cairo\Surface\Ps::setSize() expects exactly 2 parameters, 1 given
+Cairo\Surface\Ps::setSize() expects exactly 2 parameters, 3 given
+Cairo\Surface\Ps::setSize() expects parameter 1 to be float, array given
+Cairo\Surface\Ps::setSize() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoRecordingSurface/__construct.phpt b/tests/CairoSurface/CairoRecordingSurface/__construct.phpt
index 609b5f44..4e7af54f 100644
--- a/tests/CairoSurface/CairoRecordingSurface/__construct.phpt
+++ b/tests/CairoSurface/CairoRecordingSurface/__construct.phpt
@@ -1,5 +1,5 @@
 --TEST--
-new CairoRecordingSurface [__construct() method ]
+new Cairo\Surface\Recording [__construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,51 +7,51 @@ if(!in_array('RECORDING', Cairo::availableSurfaces())) die('skip - SVG surface n
 ?>
 --FILE--
 <?php
-$surface = new CairoRecordingSurface(CairoContent::COLOR_ALPHA);
+$surface = new Cairo\Surface\Recording(Cairo\Surface\Content::COLOR_ALPHA);
 var_dump($surface);
 
 $extents = array('x' => 0, 'y' => 0, 'width' => 400, 'height' => 400);
-$surface = new CairoRecordingSurface(CairoContent::COLOR_ALPHA, $extents);
+$surface = new Cairo\Surface\Recording(Cairo\Surface\Content::COLOR_ALPHA, $extents);
 var_dump($surface);
 
 /* Wrong number args - 1 */
 try {
-    new CairoRecordingSurface();
+    new Cairo\Surface\Recording();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    new CairoRecordingSurface(NULL, 1, 1, 1);
+    new Cairo\Surface\Recording(NULL, 1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    new CairoRecordingSurface(array(), 1);
+    new Cairo\Surface\Recording(array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    new CairoRecordingSurface(NULL, 1);
+    new Cairo\Surface\Recording(NULL, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoRecordingSurface)#%d (0) {
+object(Cairo\Surface\Recording)#%d (0) {
 }
-object(CairoRecordingSurface)#%d (0) {
+object(Cairo\Surface\Recording)#%d (0) {
 }
-CairoRecordingSurface::__construct() expects at least 1 parameter, 0 given
-CairoRecordingSurface::__construct() expects at most 2 parameters, 4 given
-CairoRecordingSurface::__construct() expects parameter 1 to be long, array given
-CairoRecordingSurface::__construct() expects parameter 2 to be array, integer given
+Cairo\Surface\Recording::__construct() expects at least 1 parameter, 0 given
+Cairo\Surface\Recording::__construct() expects at most 2 parameters, 4 given
+Cairo\Surface\Recording::__construct() expects parameter 1 to be int, array given
+Cairo\Surface\Recording::__construct() expects parameter 2 to be array, int given
diff --git a/tests/CairoSurface/CairoSubSurface/__construct.phpt b/tests/CairoSurface/CairoSubSurface/__construct.phpt
index 6d3dbcb4..c7d48f7b 100644
--- a/tests/CairoSurface/CairoSubSurface/__construct.phpt
+++ b/tests/CairoSurface/CairoSubSurface/__construct.phpt
@@ -1,21 +1,21 @@
 --TEST--
-new CairoSubSurface [ __construct method ]
+new Cairo\Surface\SubSurface [ __construct method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-class test extends CairoSubSurface {}
+class test extends Cairo\Surface\SubSurface {}
 
-class test2 extends CairoSubSurface {
+class test2 extends Cairo\Surface\SubSurface {
 	public function __construct() {}
 }
 
 try {
 	$surface = new test();
 	echo 'Attempting to use constructor should throw an exception';
-} catch (CairoException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage();
 }
 
@@ -24,5 +24,5 @@ $surface->finish();
 echo 'First call to any method should throw a fatal error';
 ?>
 --EXPECTF--
-CairoSubSurface cannot be constructed
+Cairo\Surface\SubSurface cannot be constructed
 Fatal error: Internal surface object missing in test2 wrapper, you must call parent::__construct in extended classes in %s on line %d
diff --git a/tests/CairoSurface/CairoSurfaceType_constants.phpt b/tests/CairoSurface/CairoSurfaceType_constants.phpt
index 11b5bf32..7c17746a 100644
--- a/tests/CairoSurface/CairoSurfaceType_constants.phpt
+++ b/tests/CairoSurface/CairoSurfaceType_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoSurfaceType class constants
+Cairo\SurfaceType class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -25,7 +25,7 @@ $constants = array(
 
 $error = false;
 foreach($constants as $name) {
-	$constant = 'CairoSurfaceType::' . $name;
+	$constant = 'Cairo\SurfaceType::' . $name;
 	if (!defined($constant)) {
 		$error = true;
 		echo 'Missing Constant: ' . $constant . "\n";
diff --git a/tests/CairoSurface/CairoSvgSurface/CairoSvgVersion_constants.phpt b/tests/CairoSurface/CairoSvgSurface/CairoSvgVersion_constants.phpt
index f4853970..7da395f0 100644
--- a/tests/CairoSurface/CairoSvgSurface/CairoSvgVersion_constants.phpt
+++ b/tests/CairoSurface/CairoSvgSurface/CairoSvgVersion_constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoSvgVersion class constants
+Cairo\Surface\Svg\Version class constants
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -14,7 +14,7 @@ $constants = array(
 
 $error = false;
 foreach($constants as $name) {
-	$constant = 'CairoSvgVersion::' . $name;
+	$constant = 'Cairo\Surface\Svg\Version::' . $name;
 	if (!defined($constant)) {
 		$error = true;
 		echo 'Missing Constant: ' . $constant . "\n";
diff --git a/tests/CairoSurface/CairoSvgSurface/__construct.phpt b/tests/CairoSurface/CairoSvgSurface/__construct.phpt
index 96203f1b..70a8719f 100644
--- a/tests/CairoSurface/CairoSvgSurface/__construct.phpt
+++ b/tests/CairoSurface/CairoSvgSurface/__construct.phpt
@@ -1,5 +1,5 @@
 --TEST--
-new CairoSvgSurface [__construct() method ]
+new Cairo\Surface\Svg [__construct() method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,69 +7,69 @@ if(!in_array('SVG', Cairo::availableSurfaces())) die('skip - SVG surface not ava
 ?>
 --FILE--
 <?php
-$surface = new CairoSvgSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Svg(NULL, 50, 50);
 var_dump($surface);
 
-$surface = new CairoSvgSurface(dirname(__FILE__) . '/nametest.svg', 50, 50);
+$surface = new Cairo\Surface\Svg(dirname(__FILE__) . '/nametest.svg', 50, 50);
 var_dump($surface);
 
 $fp = fopen(dirname(__FILE__) . '/streamtest.svg', 'wb');
-$surface = new CairoSvgSurface($fp, 50, 50);
+$surface = new Cairo\Surface\Svg($fp, 50, 50);
 var_dump($surface);
 
 /* Wrong number args - 1 */
 try {
-    new CairoSvgSurface();
+    new Cairo\Surface\Svg();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    new CairoSvgSurface(NULL);
+    new Cairo\Surface\Svg(NULL);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 3 */
 try {
-    new CairoSvgSurface(NULL, 1);
+    new Cairo\Surface\Svg(NULL, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    new CairoSvgSurface(NULL, 1, 1, 1);
+    new Cairo\Surface\Svg(NULL, 1, 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    new CairoSvgSurface(array(), 1, 1);
+    new Cairo\Surface\Svg(array(), 1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (Cairo\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    new CairoSvgSurface(NULL, array(), 1);
+    new Cairo\Surface\Svg(NULL, array(), 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 3 */
 try {
-    new CairoSvgSurface(NULL, 1, array());
+    new Cairo\Surface\Svg(NULL, 1, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
@@ -79,16 +79,16 @@ unlink(dirname(__FILE__) . '/nametest.svg');
 unlink(dirname(__FILE__) . '/streamtest.svg');
 ?>
 --EXPECTF--
-object(CairoSvgSurface)#%d (0) {
+object(Cairo\Surface\Svg)#%d (0) {
 }
-object(CairoSvgSurface)#%d (0) {
+object(Cairo\Surface\Svg)#%d (0) {
 }
-object(CairoSvgSurface)#%d (0) {
+object(Cairo\Surface\Svg)#%d (0) {
 }
-CairoSvgSurface::__construct() expects exactly 3 parameters, 0 given
-CairoSvgSurface::__construct() expects exactly 3 parameters, 1 given
-CairoSvgSurface::__construct() expects exactly 3 parameters, 2 given
-CairoSvgSurface::__construct() expects exactly 3 parameters, 4 given
-CairoSvgSurface::__construct() expects parameter 1 to be null, a string, or a stream resource
-CairoSvgSurface::__construct() expects parameter 2 to be double, array given
-CairoSvgSurface::__construct() expects parameter 3 to be double, array given
\ No newline at end of file
+Cairo\Surface\Svg::__construct() expects exactly 3 parameters, 0 given
+Cairo\Surface\Svg::__construct() expects exactly 3 parameters, 1 given
+Cairo\Surface\Svg::__construct() expects exactly 3 parameters, 2 given
+Cairo\Surface\Svg::__construct() expects exactly 3 parameters, 4 given
+Cairo\Surface\Svg::__construct() expects parameter 1 to be null, a string, or a stream resource
+Cairo\Surface\Svg::__construct() expects parameter 2 to be float, array given
+Cairo\Surface\Svg::__construct() expects parameter 3 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoSvgSurface/cairo_svg_get_versions.phpt b/tests/CairoSurface/CairoSvgSurface/cairo_svg_get_versions.phpt
deleted file mode 100644
index 15bd0714..00000000
--- a/tests/CairoSurface/CairoSvgSurface/cairo_svg_get_versions.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-cairo_svg_get_versions() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('SVG', cairo_available_surfaces())) die('skip - SVG surface not available');
-?>
---FILE--
-<?php
-var_dump(cairo_svg_get_versions());
-
-cairo_svg_get_versions('foo');
-?>
---EXPECTF--
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
-Warning: cairo_svg_get_versions() expects exactly 0 parameters, 1 given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoSvgSurface/cairo_svg_surface_create.phpt b/tests/CairoSurface/CairoSvgSurface/cairo_svg_surface_create.phpt
deleted file mode 100644
index 47b10d2b..00000000
--- a/tests/CairoSurface/CairoSvgSurface/cairo_svg_surface_create.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-cairo_svg_surface_create function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('SVG', cairo_available_surfaces())) die('skip - SVG surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_svg_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-$surface = cairo_svg_surface_create(dirname(__FILE__) . '/nametest.svg', 50, 50);
-var_dump($surface);
-
-$fp = fopen(dirname(__FILE__) . '/streamtest.svg', 'wb');
-$surface = cairo_svg_surface_create($fp, 50, 50);
-var_dump($surface);
-
-// check number of args - should accept ONLY 3
-cairo_svg_surface_create();
-cairo_svg_surface_create(NULL);
-cairo_svg_surface_create(NULL, 1);
-cairo_svg_surface_create(NULL, 1, 1, 1);
-
-// check arg types, should be null, file pointer or string, then int, int
-cairo_svg_surface_create(array(), 50, 50);
-cairo_svg_surface_create(NULL, array(), 50);
-cairo_svg_surface_create(NULL, 50, array());
-?>
---CLEAN--
-<?php
-unlink(dirname(__FILE__) . '/nametest.svg');
-unlink(dirname(__FILE__) . '/streamtest.svg');
-?>
---EXPECTF--
-object(CairoSvgSurface)#%d (0) {
-}
-object(CairoSvgSurface)#%d (0) {
-}
-object(CairoSvgSurface)#%d (0) {
-}
-
-Warning: cairo_svg_surface_create() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_svg_surface_create() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_svg_surface_create() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_svg_surface_create() expects exactly 3 parameters, 4 given in %s on line %d
-
-Warning: cairo_svg_surface_create() expects parameter 1 to be null, a string, or a stream resource in %s on line %d
-
-Warning: cairo_svg_surface_create() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_svg_surface_create() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoSvgSurface/cairo_svg_surface_restrict_to_version.phpt b/tests/CairoSurface/CairoSvgSurface/cairo_svg_surface_restrict_to_version.phpt
deleted file mode 100644
index 8e3a21cc..00000000
--- a/tests/CairoSurface/CairoSvgSurface/cairo_svg_surface_restrict_to_version.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-cairo_svg_surface_restrict_to_version() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('SVG', cairo_available_surfaces())) die('skip - SVG surface not available');
-?>
---FILE--
-<?php
-$surface = cairo_svg_surface_create(NULL, 50, 50);
-var_dump($surface);
-
-cairo_svg_surface_restrict_to_version($surface, CAIRO_SVG_VERSION_1_1);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_svg_surface_restrict_to_version();
-cairo_svg_surface_restrict_to_version($surface);
-cairo_svg_surface_restrict_to_version($surface, 1, 1);
-
-// check arg types, should be svg surface object, int
-cairo_svg_surface_restrict_to_version(1, 1, 1);
-cairo_svg_surface_restrict_to_version($surface, array());
-?>
---EXPECTF--
-object(CairoSvgSurface)#%d (0) {
-}
-
-Warning: cairo_svg_surface_restrict_to_version() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_svg_surface_restrict_to_version() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_svg_surface_restrict_to_version() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_svg_surface_restrict_to_version() must be an instance of CairoSvgSurface, integer given
-
-Warning: cairo_svg_surface_restrict_to_version() expects exactly 2 parameters, 3 given in %s on line %d
-
-Warning: cairo_svg_surface_restrict_to_version() expects parameter 2 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoSvgSurface/cairo_svg_version_to_string.phpt b/tests/CairoSurface/CairoSvgSurface/cairo_svg_version_to_string.phpt
deleted file mode 100644
index 34bb1020..00000000
--- a/tests/CairoSurface/CairoSvgSurface/cairo_svg_version_to_string.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-cairo_svg_version_to_string() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('SVG', cairo_available_surfaces())) die('skip - SVG surface not available');
-?>
---FILE--
-<?php
-echo cairo_svg_version_to_string(CAIRO_SVG_VERSION_1_1), PHP_EOL;
-
-// check number of args - should accept ONLY 1
-cairo_svg_version_to_string();
-cairo_svg_version_to_string(1, 1);
-
-// check arg types, should be int
-cairo_svg_version_to_string(array());
-?>
---EXPECTF--
-SVG 1.1
-
-Warning: cairo_svg_version_to_string() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_svg_version_to_string() expects exactly 1 parameter, 2 given in %s on line %d
-
-Warning: cairo_svg_version_to_string() expects parameter 1 to be long, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoSvgSurface/getVersions.phpt b/tests/CairoSurface/CairoSvgSurface/getVersions.phpt
index da9f5e8c..2f32e868 100644
--- a/tests/CairoSurface/CairoSvgSurface/getVersions.phpt
+++ b/tests/CairoSurface/CairoSvgSurface/getVersions.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoSvgSurface::getVersions() method
+Cairo\Surface\Svg::getVersions() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,13 +7,13 @@ if(!in_array('SVG', Cairo::availableSurfaces())) die('skip - SVG surface not ava
 ?>
 --FILE--
 <?php
-var_dump(CairoSvgSurface::getVersions());
+var_dump(Cairo\Surface\Svg::getVersions());
 
 /* Wrong number args */
 try {
-    CairoSvgSurface::getVersions('foo');
+    Cairo\Surface\Svg::getVersions('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
@@ -24,4 +24,4 @@ array(2) {
   [1]=>
   int(1)
 }
-CairoSvgSurface::getVersions() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface\Svg::getVersions() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoSvgSurface/restrictToVersion.phpt b/tests/CairoSurface/CairoSvgSurface/restrictToVersion.phpt
index fcaa8764..9d4afe3f 100644
--- a/tests/CairoSurface/CairoSvgSurface/restrictToVersion.phpt
+++ b/tests/CairoSurface/CairoSvgSurface/restrictToVersion.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoSvgSurface->restrictToVersion() method
+Cairo\Surface\Svg->restrictToVersion() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,16 +7,16 @@ if(!in_array('SVG', Cairo::availableSurfaces())) die('skip - SVG surface not ava
 ?>
 --FILE--
 <?php
-$surface = new CairoSvgSurface(NULL, 50, 50);
+$surface = new Cairo\Surface\Svg(NULL, 50, 50);
 var_dump($surface);
 
-$surface->restrictToVersion(CairoSvgVersion::VERSION_1_1);
+$surface->restrictToVersion(Cairo\Surface\Svg\Version::VERSION_1_1);
 
 /* Wrong number args */
 try {
     $surface->restrictToVersion();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -24,7 +24,7 @@ try {
 try {
     $surface->restrictToVersion(1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -32,13 +32,13 @@ try {
 try {
     $surface->restrictToVersion(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoSvgSurface)#%d (0) {
+object(Cairo\Surface\Svg)#%d (0) {
 }
-CairoSvgSurface::restrictToVersion() expects exactly 1 parameter, 0 given
-CairoSvgSurface::restrictToVersion() expects exactly 1 parameter, 2 given
-CairoSvgSurface::restrictToVersion() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\Surface\Svg::restrictToVersion() expects exactly 1 parameter, 0 given
+Cairo\Surface\Svg::restrictToVersion() expects exactly 1 parameter, 2 given
+Cairo\Surface\Svg::restrictToVersion() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/CairoSvgSurface/versionToString.phpt b/tests/CairoSurface/CairoSvgSurface/versionToString.phpt
index 520a8ac0..b6a009de 100644
--- a/tests/CairoSurface/CairoSvgSurface/versionToString.phpt
+++ b/tests/CairoSurface/CairoSvgSurface/versionToString.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoSvgSurface::versionToString() method
+Cairo\Surface\Svg::versionToString() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,34 +7,34 @@ if(!in_array('SVG', Cairo::availableSurfaces())) die('skip - SVG surface not ava
 ?>
 --FILE--
 <?php
-echo CairoSvgSurface::versionToString(CairoSvgVersion::VERSION_1_1), PHP_EOL;
+echo Cairo\Surface\Svg::versionToString(Cairo\Surface\Svg\Version::VERSION_1_1), PHP_EOL;
 
 /* Wrong number args */
 try {
-    CairoSvgSurface::versionToString();
+    Cairo\Surface\Svg::versionToString();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args 2 */
 try {
-    CairoSvgSurface::versionToString(1, 1);
+    Cairo\Surface\Svg::versionToString(1, 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type */
 try {
-    CairoSvgSurface::versionToString(array());
+    Cairo\Surface\Svg::versionToString(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
 SVG 1.1
-CairoSvgSurface::versionToString() expects exactly 1 parameter, 0 given
-CairoSvgSurface::versionToString() expects exactly 1 parameter, 2 given
-CairoSvgSurface::versionToString() expects parameter 1 to be long, array given
\ No newline at end of file
+Cairo\Surface\Svg::versionToString() expects exactly 1 parameter, 0 given
+Cairo\Surface\Svg::versionToString() expects exactly 1 parameter, 2 given
+Cairo\Surface\Svg::versionToString() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/__construct.phpt b/tests/CairoSurface/__construct.phpt
index b606d6df..c9949b5d 100644
--- a/tests/CairoSurface/__construct.phpt
+++ b/tests/CairoSurface/__construct.phpt
@@ -1,21 +1,21 @@
 --TEST--
-new CairoSurface [ __construct method ]
+new Cairo\Surface [ __construct method ]
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-class test extends CairoSurface {}
+class test extends Cairo\Surface {}
 
-class test2 extends CairoSurface {
+class test2 extends Cairo\Surface {
 	public function __construct() {}
 }
 
 try {
 	$surface = new test();
 	echo 'Attempting to use constructor should throw an exception';
-} catch (CairoException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage();
 }
 
@@ -24,5 +24,5 @@ $surface->finish();
 echo 'First call to any method should throw a fatal error';
 ?>
 --EXPECTF--
-CairoSurface cannot be constructed
+Cairo\Surface cannot be constructed
 Fatal error: Internal surface object missing in test2 wrapper, you must call parent::__construct in extended classes in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_copy_page.phpt b/tests/CairoSurface/cairo_surface_copy_page.phpt
deleted file mode 100644
index d5e1a23b..00000000
--- a/tests/CairoSurface/cairo_surface_copy_page.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_surface_copy_page() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_surface_copy_page')) die('skip - cairo_surface_copy_page not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_copy_page($surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_copy_page();
-cairo_surface_copy_page($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_copy_page(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_copy_page() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_copy_page() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_copy_page() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_copy_page() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_create_for_rectangle.phpt b/tests/CairoSurface/cairo_surface_create_for_rectangle.phpt
deleted file mode 100644
index 057f8d95..00000000
--- a/tests/CairoSurface/cairo_surface_create_for_rectangle.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-cairo_surface_create_for_rectangle () function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_create_for_rectangle($surface, 0, 0, 25, 25));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 5
-cairo_surface_create_for_rectangle ();
-cairo_surface_create_for_rectangle ($surface);
-cairo_surface_create_for_rectangle ($surface, 1);
-cairo_surface_create_for_rectangle ($surface, 1, 1);
-cairo_surface_create_for_rectangle ($surface, 1, 1, 1, 1);
-
-// check arg types, should be surface object, int int, int
-cairo_surface_create_for_rectangle (1, 1, 1, 1);
-cairo_surface_create_for_rectangle ($surface, array(), 1, 1);
-cairo_surface_create_for_rectangle ($surface, 1, array(), 1);
-cairo_surface_create_for_rectangle ($surface, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#1 (0) {
-}
-object(CairoSubSurface)#2 (0) {
-}
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 0 given in %s on line %d
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 1 given in %s on line %d
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 2 given in %s on line %d
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_create_for_rectangle() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 4 given in %s on line %d
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 4 given in %s on line %d
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 4 given in %s on line %d
-
-Warning: cairo_surface_create_for_rectangle() expects exactly 5 parameters, 4 given in %s on line %d
diff --git a/tests/CairoSurface/cairo_surface_create_similar.phpt b/tests/CairoSurface/cairo_surface_create_similar.phpt
deleted file mode 100644
index 559494e5..00000000
--- a/tests/CairoSurface/cairo_surface_create_similar.phpt
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-cairo_surface_create_similar () function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_create_similar($surface, CAIRO_CONTENT_COLOR, 10, 10));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 4
-cairo_surface_create_similar ();
-cairo_surface_create_similar ($surface);
-cairo_surface_create_similar ($surface, 1);
-cairo_surface_create_similar ($surface, 1, 1);
-cairo_surface_create_similar ($surface, 1, 1, 1, 1);
-
-// check arg types, should be surface object, int int, int
-cairo_surface_create_similar (1, 1, 1, 1);
-cairo_surface_create_similar ($surface, array(), 1, 1);
-cairo_surface_create_similar ($surface, 1, array(), 1);
-cairo_surface_create_similar ($surface, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_create_similar() expects exactly 4 parameters, 0 given in %s on line %d
-
-Warning: cairo_surface_create_similar() expects exactly 4 parameters, 1 given in %s on line %d
-
-Warning: cairo_surface_create_similar() expects exactly 4 parameters, 2 given in %s on line %d
-
-Warning: cairo_surface_create_similar() expects exactly 4 parameters, 3 given in %s on line %d
-
-Warning: cairo_surface_create_similar() expects exactly 4 parameters, 5 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_create_similar() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_create_similar() expects parameter 1 to be CairoSurface, integer given in %s on line %d
-
-Warning: cairo_surface_create_similar() expects parameter 2 to be long, array given in %s on line %d
-
-Warning: cairo_surface_create_similar() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_surface_create_similar() expects parameter 4 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_finish.phpt b/tests/CairoSurface/cairo_surface_finish.phpt
deleted file mode 100644
index 1fa87f43..00000000
--- a/tests/CairoSurface/cairo_surface_finish.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-cairo_surface_finish() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_finish($surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_finish();
-cairo_surface_finish($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_finish(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_finish() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_finish() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_finish() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_finish() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_flush.phpt b/tests/CairoSurface/cairo_surface_flush.phpt
deleted file mode 100644
index 42b77132..00000000
--- a/tests/CairoSurface/cairo_surface_flush.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-cairo_surface_finish() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_flush($surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_flush();
-cairo_surface_flush($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_flush(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_flush() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_flush() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_flush() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_flush() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_get_content.phpt b/tests/CairoSurface/cairo_surface_get_content.phpt
deleted file mode 100644
index b030be03..00000000
--- a/tests/CairoSurface/cairo_surface_get_content.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_surface_get_content() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_get_content($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_get_content();
-cairo_surface_get_content($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_get_content(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(12288)
-
-Warning: cairo_surface_get_content() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_get_content() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_get_content() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_get_content() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_get_device_offset.phpt b/tests/CairoSurface/cairo_surface_get_device_offset.phpt
deleted file mode 100644
index d0dbc398..00000000
--- a/tests/CairoSurface/cairo_surface_get_device_offset.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-cairo_surface_get_device_offset() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_get_device_offset($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_get_device_offset();
-cairo_surface_get_device_offset($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_get_device_offset(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(%d)
-  [1]=>
-  float(%d)
-}
-
-Warning: cairo_surface_get_device_offset() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_get_device_offset() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_get_device_offset() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_get_device_offset() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_get_fallback_resolution.phpt b/tests/CairoSurface/cairo_surface_get_fallback_resolution.phpt
deleted file mode 100644
index b59294ec..00000000
--- a/tests/CairoSurface/cairo_surface_get_fallback_resolution.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-cairo_surface_get_fallback_resolution() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_surface_get_fallback_resolution')) die('skip - cairo_surface_get_fallback_resolution is not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_get_fallback_resolution($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_get_fallback_resolution();
-cairo_surface_get_fallback_resolution($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_get_fallback_resolution(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-array(2) {
-  [0]=>
-  float(%d)
-  [1]=>
-  float(%d)
-}
-
-Warning: cairo_surface_get_fallback_resolution() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_get_fallback_resolution() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_get_fallback_resolution() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_get_fallback_resolution() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_get_font_options.phpt b/tests/CairoSurface/cairo_surface_get_font_options.phpt
deleted file mode 100644
index fb378e57..00000000
--- a/tests/CairoSurface/cairo_surface_get_font_options.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-cairo_surface_get_font_options() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_get_font_options($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_get_font_options();
-cairo_surface_get_font_options($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_get_font_options(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-object(CairoFontOptions)#%d (0) {
-}
-
-Warning: cairo_surface_get_font_options() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_get_font_options() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_get_font_options() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_get_font_options() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_get_type.phpt b/tests/CairoSurface/cairo_surface_get_type.phpt
deleted file mode 100644
index b7274228..00000000
--- a/tests/CairoSurface/cairo_surface_get_type.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_surface_get_type() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_get_type($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_get_type();
-cairo_surface_get_type($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_get_type(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(0)
-
-Warning: cairo_surface_get_type() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_get_type() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_get_type() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_get_type() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_has_show_text_glyphs.phpt b/tests/CairoSurface/cairo_surface_has_show_text_glyphs.phpt
deleted file mode 100644
index 32b5a92d..00000000
--- a/tests/CairoSurface/cairo_surface_has_show_text_glyphs.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-cairo_surface_has_show_text_glyphs() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_surface_has_show_text_glyphs')) die('skip - cairo_surface_has_show_text_glyphs is not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-var_dump(cairo_surface_has_show_text_glyphs($surface));
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_has_show_text_glyphs();
-cairo_surface_has_show_text_glyphs($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_has_show_text_glyphs(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-bool(false)
-
-Warning: cairo_surface_has_show_text_glyphs() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_has_show_text_glyphs() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_has_show_text_glyphs() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_has_show_text_glyphs() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_mark_dirty.phpt b/tests/CairoSurface/cairo_surface_mark_dirty.phpt
deleted file mode 100644
index fbf69420..00000000
--- a/tests/CairoSurface/cairo_surface_mark_dirty.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-cairo_surface_mark_dirty() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_mark_dirty($surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_mark_dirty();
-cairo_surface_mark_dirty($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_mark_dirty(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_mark_dirty() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_mark_dirty() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_mark_dirty() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_mark_dirty() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_mark_dirty_rectangle.phpt b/tests/CairoSurface/cairo_surface_mark_dirty_rectangle.phpt
deleted file mode 100644
index 1d4b2ff0..00000000
--- a/tests/CairoSurface/cairo_surface_mark_dirty_rectangle.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-cairo_surface_mark_dirty_rectangle() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_mark_dirty_rectangle($surface, 10, 10, 10, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 5
-cairo_surface_mark_dirty_rectangle();
-cairo_surface_mark_dirty_rectangle($surface);
-cairo_surface_mark_dirty_rectangle($surface, 1);
-cairo_surface_mark_dirty_rectangle($surface, 1, 1);
-cairo_surface_mark_dirty_rectangle($surface, 1, 1, 1);
-cairo_surface_mark_dirty_rectangle($surface, 1, 1, 1, 1, 1);
-
-// check arg types, should be surface object, int int, int, int
-cairo_surface_mark_dirty_rectangle(1, 1, 1, 1, 1);
-cairo_surface_mark_dirty_rectangle($surface, array(), 1, 1, 1);
-cairo_surface_mark_dirty_rectangle($surface, 1, array(), 1, 1);
-cairo_surface_mark_dirty_rectangle($surface, 1, 1, array(), 1);
-cairo_surface_mark_dirty_rectangle($surface, 1, 1, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_mark_dirty_rectangle() expects exactly 5 parameters, 0 given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects exactly 5 parameters, 1 given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects exactly 5 parameters, 2 given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects exactly 5 parameters, 3 given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects exactly 5 parameters, 4 given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects exactly 5 parameters, 6 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_mark_dirty_rectangle() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_mark_dirty_rectangle() expects parameter 1 to be CairoSurface, integer given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects parameter 3 to be double, array given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects parameter 4 to be double, array given in %s on line %d
-
-Warning: cairo_surface_mark_dirty_rectangle() expects parameter 5 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_set_device_offset.phpt b/tests/CairoSurface/cairo_surface_set_device_offset.phpt
deleted file mode 100644
index bd1351ac..00000000
--- a/tests/CairoSurface/cairo_surface_set_device_offset.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-cairo_surface_set_device_offset() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_set_device_offset($surface, 10, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 3
-cairo_surface_set_device_offset();
-cairo_surface_set_device_offset($surface);
-cairo_surface_set_device_offset($surface, 1);
-cairo_surface_set_device_offset($surface, 1, 1, 1);
-
-// check arg types, should be surface object, int int
-cairo_surface_set_device_offset(1, 1, 1);
-cairo_surface_set_device_offset($surface, array(), 1);
-cairo_surface_set_device_offset($surface, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_set_device_offset() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_surface_set_device_offset() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_surface_set_device_offset() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_surface_set_device_offset() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_set_device_offset() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_set_device_offset() expects parameter 1 to be CairoSurface, integer given in %s on line %d
-
-Warning: cairo_surface_set_device_offset() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_surface_set_device_offset() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_set_fallback_resolution.phpt b/tests/CairoSurface/cairo_surface_set_fallback_resolution.phpt
deleted file mode 100644
index 11df00d3..00000000
--- a/tests/CairoSurface/cairo_surface_set_fallback_resolution.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-cairo_surface_set_fallback_resolution() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_set_fallback_resolution($surface, 10, 10);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 3
-cairo_surface_set_fallback_resolution();
-cairo_surface_set_fallback_resolution($surface);
-cairo_surface_set_fallback_resolution($surface, 1);
-cairo_surface_set_fallback_resolution($surface, 1, 1, 1);
-
-// check arg types, should be surface object, int int
-cairo_surface_set_fallback_resolution(1, 1, 1);
-cairo_surface_set_fallback_resolution($surface, array(), 1);
-cairo_surface_set_fallback_resolution($surface, 1, array());
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_set_fallback_resolution() expects exactly 3 parameters, 0 given in %s on line %d
-
-Warning: cairo_surface_set_fallback_resolution() expects exactly 3 parameters, 1 given in %s on line %d
-
-Warning: cairo_surface_set_fallback_resolution() expects exactly 3 parameters, 2 given in %s on line %d
-
-Warning: cairo_surface_set_fallback_resolution() expects exactly 3 parameters, 4 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_set_fallback_resolution() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_set_fallback_resolution() expects parameter 1 to be CairoSurface, integer given in %s on line %d
-
-Warning: cairo_surface_set_fallback_resolution() expects parameter 2 to be double, array given in %s on line %d
-
-Warning: cairo_surface_set_fallback_resolution() expects parameter 3 to be double, array given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_show_page.phpt b/tests/CairoSurface/cairo_surface_show_page.phpt
deleted file mode 100644
index 564dc12e..00000000
--- a/tests/CairoSurface/cairo_surface_show_page.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-cairo_surface_show_page() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!function_exists('cairo_surface_show_page')) die('skip - cairo_surface_show_page not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_show_page($surface);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_show_page();
-cairo_surface_show_page($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_show_page(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_show_page() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_show_page() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_show_page() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_show_page() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_status.phpt b/tests/CairoSurface/cairo_surface_status.phpt
deleted file mode 100644
index 2c2fcc08..00000000
--- a/tests/CairoSurface/cairo_surface_status.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-cairo_surface_status() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-$status = cairo_surface_status($surface);
-
-var_dump($status);
-var_dump($status == CAIRO_STATUS_SUCCESS);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 1
-cairo_surface_status();
-cairo_surface_status($surface, 1);
-
-// check arg types, should be surface object
-cairo_surface_status(1);
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-int(0)
-bool(true)
-
-Warning: cairo_surface_status() expects exactly 1 parameter, 0 given in %s on line %d
-
-Warning: cairo_surface_status() expects exactly 1 parameter, 2 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_status() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_status() expects parameter 1 to be CairoSurface, integer given in %s on line %d
\ No newline at end of file
diff --git a/tests/CairoSurface/cairo_surface_write_to_png.phpt b/tests/CairoSurface/cairo_surface_write_to_png.phpt
deleted file mode 100644
index 43f97e8e..00000000
--- a/tests/CairoSurface/cairo_surface_write_to_png.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
---TEST--
-cairo_surface_write_to_png() function
---SKIPIF--
-<?php
-if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!in_array('PNG', cairo_available_surfaces())) die('skip - PNG support not available');
-?>
---FILE--
-<?php
-$surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 50, 50);
-var_dump($surface);
-
-cairo_surface_write_to_png($surface, dirname(__FILE__) . '/test.png');
-
-$fp = fopen(dirname(__FILE__) . '/stream.png', 'wb');
-cairo_surface_write_to_png($surface, $fp);
-
-// bad type hint is an E_RECOVERABLE_ERROR, so let's hook a handler
-function bad_class($errno, $errstr) {
-	echo 'CAUGHT ERROR: ' . $errstr, PHP_EOL;
-}
-set_error_handler('bad_class', E_RECOVERABLE_ERROR);
-
-// check number of args - should accept ONLY 2
-cairo_surface_write_to_png();
-cairo_surface_write_to_png($surface);
-cairo_surface_write_to_png($surface, 1, 1);
-
-// check arg types, should be surface object, string or resource
-cairo_surface_write_to_png(1, $fp);
-cairo_surface_write_to_png($surface, 1);
-?>
---CLEAN--
-<?php
-unlink(dirname(__FILE__) . '/test.png');
-unlink(dirname(__FILE__) . '/stream.png');
-?>
---EXPECTF--
-object(CairoImageSurface)#%d (0) {
-}
-
-Warning: cairo_surface_write_to_png() expects exactly 2 parameters, 0 given in %s on line %d
-
-Warning: cairo_surface_write_to_png() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: cairo_surface_write_to_png() expects exactly 2 parameters, 3 given in %s on line %d
-CAUGHT ERROR: Argument 1 passed to cairo_surface_write_to_png() must be an instance of CairoSurface, integer given
-
-Warning: cairo_surface_write_to_png() expects parameter 1 to be CairoSurface, integer given in %s on line %d
-
-Warning: cairo_surface_write_to_png() expects parameter 1 to be a string or a stream resource in %s on line %d
diff --git a/tests/CairoSurface/copyPage.phpt b/tests/CairoSurface/copyPage.phpt
index 8bc80f42..67fc479a 100644
--- a/tests/CairoSurface/copyPage.phpt
+++ b/tests/CairoSurface/copyPage.phpt
@@ -1,13 +1,13 @@
 --TEST--
-CairoSurface->copyPage() method
+Cairo\Surface->copyPage() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!method_exists('CairoSurface', 'copyPage')) die('skip - CairoSurface->copyPage not available');
+if(!method_exists('Cairo\Surface', 'copyPage')) die('skip - Cairo\Surface->copyPage not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->copyPage();
@@ -16,11 +16,11 @@ $surface->copyPage();
 try {
     $surface->copyPage('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::copyPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::copyPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/createSimilar.phpt b/tests/CairoSurface/createSimilar.phpt
index 8aa5eee3..77a29216 100644
--- a/tests/CairoSurface/createSimilar.phpt
+++ b/tests/CairoSurface/createSimilar.phpt
@@ -1,46 +1,46 @@
 --TEST--
-CairoSurface->createSimilar() method
+Cairo\Surface->createSimilar() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
-$newsurface = $surface->createSimilar(CairoContent::COLOR, 10, 10);
+$newsurface = $surface->createSimilar(Cairo\Surface\Content::COLOR, 10, 10);
 var_dump($newsurface);
 
 /* Wrong number args - 1 */
 try {
     $surface->createSimilar();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 2 */
 try {
-    $surface->createSimilar(CairoContent::COLOR);
+    $surface->createSimilar(Cairo\Surface\Content::COLOR);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 3 */
 try {
-    $surface->createSimilar(CairoContent::COLOR, 10);
+    $surface->createSimilar(Cairo\Surface\Content::COLOR, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong number args - 4 */
 try {
-    $surface->createSimilar(CairoContent::COLOR, 10, 10, 10);
+    $surface->createSimilar(Cairo\Surface\Content::COLOR, 10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -48,35 +48,35 @@ try {
 try {
     $surface->createSimilar(array(), 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    $surface->createSimilar(CairoContent::COLOR, array(), 10);
+    $surface->createSimilar(Cairo\Surface\Content::COLOR, array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 3 */
 try {
-    $surface->createSimilar(CairoContent::COLOR, 10, array());
+    $surface->createSimilar(Cairo\Surface\Content::COLOR, 10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::createSimilar() expects exactly 3 parameters, 0 given
-CairoSurface::createSimilar() expects exactly 3 parameters, 1 given
-CairoSurface::createSimilar() expects exactly 3 parameters, 2 given
-CairoSurface::createSimilar() expects exactly 3 parameters, 4 given
-CairoSurface::createSimilar() expects parameter 1 to be long, array given
-CairoSurface::createSimilar() expects parameter 2 to be double, array given
-CairoSurface::createSimilar() expects parameter 3 to be double, array given
\ No newline at end of file
+Cairo\Surface::createSimilar() expects exactly 3 parameters, 0 given
+Cairo\Surface::createSimilar() expects exactly 3 parameters, 1 given
+Cairo\Surface::createSimilar() expects exactly 3 parameters, 2 given
+Cairo\Surface::createSimilar() expects exactly 3 parameters, 4 given
+Cairo\Surface::createSimilar() expects parameter 1 to be int, array given
+Cairo\Surface::createSimilar() expects parameter 2 to be float, array given
+Cairo\Surface::createSimilar() expects parameter 3 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/finish.phpt b/tests/CairoSurface/finish.phpt
index ab392475..337405ac 100644
--- a/tests/CairoSurface/finish.phpt
+++ b/tests/CairoSurface/finish.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->finish() method
+Cairo\Surface->finish() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->finish();
@@ -15,11 +15,11 @@ $surface->finish();
 try {
     $surface->finish('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::finish() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::finish() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/flush.phpt b/tests/CairoSurface/flush.phpt
index ff397b82..9ac8e319 100644
--- a/tests/CairoSurface/flush.phpt
+++ b/tests/CairoSurface/flush.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->flush() method
+Cairo\Surface->flush() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->flush();
@@ -15,11 +15,11 @@ $surface->flush();
 try {
     $surface->flush('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::flush() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::flush() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/getContent.phpt b/tests/CairoSurface/getContent.phpt
index a8bc67d3..3f40fb9c 100644
--- a/tests/CairoSurface/getContent.phpt
+++ b/tests/CairoSurface/getContent.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->getContent() method
+Cairo\Surface->getContent() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getContent());
@@ -15,12 +15,12 @@ var_dump($surface->getContent());
 try {
     $surface->getContent('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(12288)
-CairoSurface::getContent() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(12288)
+Cairo\Surface::getContent() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/getDeviceOffset.phpt b/tests/CairoSurface/getDeviceOffset.phpt
index eaf11d51..182c8f78 100644
--- a/tests/CairoSurface/getDeviceOffset.phpt
+++ b/tests/CairoSurface/getDeviceOffset.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->getDeviceOffset() method
+Cairo\Surface->getDeviceOffset() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getDeviceOffset());
@@ -15,12 +15,12 @@ var_dump($surface->getDeviceOffset());
 try {
     $surface->getDeviceOffset('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -28,4 +28,4 @@ array(2) {
   [1]=>
   float(0)
 }
-CairoSurface::getDeviceOffset() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::getDeviceOffset() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoSurface/getFallbackResolution.phpt b/tests/CairoSurface/getFallbackResolution.phpt
index 0e977cdc..27e44f96 100644
--- a/tests/CairoSurface/getFallbackResolution.phpt
+++ b/tests/CairoSurface/getFallbackResolution.phpt
@@ -1,13 +1,13 @@
 --TEST--
-CairoSurface->getFallbackResolution() method
+Cairo\Surface->getFallbackResolution() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!method_exists('CairoSurface', 'getFallbackResolution')) die('skip - CairoSurface->getFallbackResolution not available');
+if(!method_exists('Cairo\Surface', 'getFallbackResolution')) die('skip - Cairo\Surface->getFallbackResolution not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getFallbackResolution());
@@ -16,12 +16,12 @@ var_dump($surface->getFallbackResolution());
 try {
     $surface->getFallbackResolution('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
 array(2) {
   [0]=>
@@ -29,4 +29,4 @@ array(2) {
   [1]=>
   float(%d)
 }
-CairoSurface::getFallbackResolution() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::getFallbackResolution() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/getFontOptions.phpt b/tests/CairoSurface/getFontOptions.phpt
index fc78e25d..c67a9edb 100644
--- a/tests/CairoSurface/getFontOptions.phpt
+++ b/tests/CairoSurface/getFontOptions.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->getFontOptions() method
+Cairo\Surface->getFontOptions() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getFontOptions());
@@ -15,13 +15,13 @@ var_dump($surface->getFontOptions());
 try {
     $surface->getFontOptions('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-object(CairoFontOptions)#%d (0) {
+object(Cairo\FontOptions)#%d (0) {
 }
-CairoSurface::getFontOptions() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::getFontOptions() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/getType.phpt b/tests/CairoSurface/getType.phpt
index 099151b7..81d488f4 100644
--- a/tests/CairoSurface/getType.phpt
+++ b/tests/CairoSurface/getType.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->getType() method
+Cairo\Surface->getType() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->getType());
@@ -15,12 +15,12 @@ var_dump($surface->getType());
 try {
     $surface->getType('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(0)
-CairoSurface::getType() expects exactly 0 parameters, 1 given
\ No newline at end of file
+long(0)
+Cairo\Surface::getType() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/hasShowTextGlyphs.phpt b/tests/CairoSurface/hasShowTextGlyphs.phpt
index 03edcde1..159ee5fb 100644
--- a/tests/CairoSurface/hasShowTextGlyphs.phpt
+++ b/tests/CairoSurface/hasShowTextGlyphs.phpt
@@ -1,13 +1,13 @@
 --TEST--
-CairoSurface->hasShowTextGlyphs() method
+Cairo\Surface->hasShowTextGlyphs() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!method_exists('CairoSurface', 'hasShowTextGlyphs')) die('skip - CairoSurface->hasShowTextGlyphs not available');
+if(!method_exists('Cairo\Surface', 'hasShowTextGlyphs')) die('skip - Cairo\Surface->hasShowTextGlyphs not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 var_dump($surface->hasShowTextGlyphs());
@@ -16,12 +16,12 @@ var_dump($surface->hasShowTextGlyphs());
 try {
     $surface->hasShowTextGlyphs('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
 bool(false)
-CairoSurface::hasShowTextGlyphs() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::hasShowTextGlyphs() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/markDirty.phpt b/tests/CairoSurface/markDirty.phpt
index d51fd868..568b00d5 100644
--- a/tests/CairoSurface/markDirty.phpt
+++ b/tests/CairoSurface/markDirty.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->markDirty() method
+Cairo\Surface->markDirty() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->markDirty();
@@ -15,11 +15,11 @@ $surface->markDirty();
 try {
     $surface->markDirty('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::markDirty() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::markDirty() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/markDirtyRectangle.phpt b/tests/CairoSurface/markDirtyRectangle.phpt
index 85407bf5..2e170330 100644
--- a/tests/CairoSurface/markDirtyRectangle.phpt
+++ b/tests/CairoSurface/markDirtyRectangle.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->markDirtyRectangle() method
+Cairo\Surface->markDirtyRectangle() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->markDirtyRectangle(10, 10, 10, 10);
@@ -15,7 +15,7 @@ $surface->markDirtyRectangle(10, 10, 10, 10);
 try {
     $surface->markDirtyRectangle();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -23,7 +23,7 @@ try {
 try {
     $surface->markDirtyRectangle(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -31,7 +31,7 @@ try {
 try {
     $surface->markDirtyRectangle(10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -39,7 +39,7 @@ try {
 try {
     $surface->markDirtyRectangle(10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -47,7 +47,7 @@ try {
 try {
     $surface->markDirtyRectangle(10, 10, 10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -55,7 +55,7 @@ try {
 try {
     $surface->markDirtyRectangle(array(), 10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -63,7 +63,7 @@ try {
 try {
     $surface->markDirtyRectangle(10, array(), 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -71,7 +71,7 @@ try {
 try {
     $surface->markDirtyRectangle(10, 10, array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -79,19 +79,19 @@ try {
 try {
     $surface->markDirtyRectangle(10, 10, 10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::markDirtyRectangle() expects exactly 4 parameters, 0 given
-CairoSurface::markDirtyRectangle() expects exactly 4 parameters, 1 given
-CairoSurface::markDirtyRectangle() expects exactly 4 parameters, 2 given
-CairoSurface::markDirtyRectangle() expects exactly 4 parameters, 2 given
-CairoSurface::markDirtyRectangle() expects exactly 4 parameters, 5 given
-CairoSurface::markDirtyRectangle() expects parameter 1 to be double, array given
-CairoSurface::markDirtyRectangle() expects parameter 2 to be double, array given
-CairoSurface::markDirtyRectangle() expects parameter 3 to be double, array given
-CairoSurface::markDirtyRectangle() expects parameter 4 to be double, array given
\ No newline at end of file
+Cairo\Surface::markDirtyRectangle() expects exactly 4 parameters, 0 given
+Cairo\Surface::markDirtyRectangle() expects exactly 4 parameters, 1 given
+Cairo\Surface::markDirtyRectangle() expects exactly 4 parameters, 2 given
+Cairo\Surface::markDirtyRectangle() expects exactly 4 parameters, 2 given
+Cairo\Surface::markDirtyRectangle() expects exactly 4 parameters, 5 given
+Cairo\Surface::markDirtyRectangle() expects parameter 1 to be float, array given
+Cairo\Surface::markDirtyRectangle() expects parameter 2 to be float, array given
+Cairo\Surface::markDirtyRectangle() expects parameter 3 to be float, array given
+Cairo\Surface::markDirtyRectangle() expects parameter 4 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/setDeviceOffset.phpt b/tests/CairoSurface/setDeviceOffset.phpt
index 32600073..521c62fb 100644
--- a/tests/CairoSurface/setDeviceOffset.phpt
+++ b/tests/CairoSurface/setDeviceOffset.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->setDeviceOffset() method
+Cairo\Surface->setDeviceOffset() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->setDeviceOffset(10, 10);
@@ -15,7 +15,7 @@ $surface->setDeviceOffset(10, 10);
 try {
     $surface->setDeviceOffset();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -23,7 +23,7 @@ try {
 try {
     $surface->setDeviceOffset(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -31,7 +31,7 @@ try {
 try {
     $surface->setDeviceOffset(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -39,7 +39,7 @@ try {
 try {
     $surface->setDeviceOffset(array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -47,15 +47,15 @@ try {
 try {
     $surface->setDeviceOffset(10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::setDeviceOffset() expects exactly 2 parameters, 0 given
-CairoSurface::setDeviceOffset() expects exactly 2 parameters, 1 given
-CairoSurface::setDeviceOffset() expects exactly 2 parameters, 3 given
-CairoSurface::setDeviceOffset() expects parameter 1 to be double, array given
-CairoSurface::setDeviceOffset() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Surface::setDeviceOffset() expects exactly 2 parameters, 0 given
+Cairo\Surface::setDeviceOffset() expects exactly 2 parameters, 1 given
+Cairo\Surface::setDeviceOffset() expects exactly 2 parameters, 3 given
+Cairo\Surface::setDeviceOffset() expects parameter 1 to be float, array given
+Cairo\Surface::setDeviceOffset() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/setFallbackResolution.phpt b/tests/CairoSurface/setFallbackResolution.phpt
index 4c18745b..34ccc53b 100644
--- a/tests/CairoSurface/setFallbackResolution.phpt
+++ b/tests/CairoSurface/setFallbackResolution.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->setFallbackResolution() method
+Cairo\Surface->setFallbackResolution() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->setFallbackResolution(10, 10);
@@ -15,7 +15,7 @@ $surface->setFallbackResolution(10, 10);
 try {
     $surface->setFallbackResolution();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -23,7 +23,7 @@ try {
 try {
     $surface->setFallbackResolution(10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -31,7 +31,7 @@ try {
 try {
     $surface->setFallbackResolution(10, 10, 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -39,7 +39,7 @@ try {
 try {
     $surface->setFallbackResolution(array(), 10);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -47,15 +47,15 @@ try {
 try {
     $surface->setFallbackResolution(10, array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::setFallbackResolution() expects exactly 2 parameters, 0 given
-CairoSurface::setFallbackResolution() expects exactly 2 parameters, 1 given
-CairoSurface::setFallbackResolution() expects exactly 2 parameters, 3 given
-CairoSurface::setFallbackResolution() expects parameter 1 to be double, array given
-CairoSurface::setFallbackResolution() expects parameter 2 to be double, array given
\ No newline at end of file
+Cairo\Surface::setFallbackResolution() expects exactly 2 parameters, 0 given
+Cairo\Surface::setFallbackResolution() expects exactly 2 parameters, 1 given
+Cairo\Surface::setFallbackResolution() expects exactly 2 parameters, 3 given
+Cairo\Surface::setFallbackResolution() expects parameter 1 to be float, array given
+Cairo\Surface::setFallbackResolution() expects parameter 2 to be float, array given
\ No newline at end of file
diff --git a/tests/CairoSurface/showPage.phpt b/tests/CairoSurface/showPage.phpt
index 1e19e0fd..9132c002 100644
--- a/tests/CairoSurface/showPage.phpt
+++ b/tests/CairoSurface/showPage.phpt
@@ -1,13 +1,13 @@
 --TEST--
-CairoSurface->showPage() method
+Cairo\Surface->showPage() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
-if(!method_exists('CairoSurface', 'showPage')) die('skip - CairoSurface->showPage not available');
+if(!method_exists('Cairo\Surface', 'showPage')) die('skip - Cairo\Surface->showPage not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->showPage();
@@ -16,11 +16,11 @@ $surface->showPage();
 try {
     $surface->showPage('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::showPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::showPage() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/status.phpt b/tests/CairoSurface/status.phpt
index 85d3b836..693bb67f 100644
--- a/tests/CairoSurface/status.phpt
+++ b/tests/CairoSurface/status.phpt
@@ -1,12 +1,12 @@
 --TEST--
-CairoSurface->status() method
+Cairo\Surface->status() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $status = $surface->status();
@@ -18,13 +18,13 @@ var_dump($status == CairoStatus::SUCCESS);
 try {
     $surface->status('foo');
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-int(0)
+long(0)
 bool(true)
-CairoSurface::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
+Cairo\Surface::status() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/CairoSurface/writeToPng.phpt b/tests/CairoSurface/writeToPng.phpt
index 5296c64d..ef971d0c 100644
--- a/tests/CairoSurface/writeToPng.phpt
+++ b/tests/CairoSurface/writeToPng.phpt
@@ -1,5 +1,5 @@
 --TEST--
-CairoSurface::writeToPng() method
+Cairo\Surface::writeToPng() method
 --SKIPIF--
 <?php
 if(!extension_loaded('cairo')) die('skip - Cairo extension not available');
@@ -7,7 +7,7 @@ if(!in_array('PNG', cairo_available_surfaces())) die('skip - PNG support not ava
 ?>
 --FILE--
 <?php
-$surface = new CairoImageSurface(CairoFormat::ARGB32, 50, 50);
+$surface = new Cairo\Surface\Image(Cairo\Surface\ImageFormat::ARGB32, 50, 50);
 var_dump($surface);
 
 $surface->writeToPng(dirname(__FILE__) . '/test.png');
@@ -19,7 +19,7 @@ $surface->writeToPng($fp);
 try {
     $surface->writeToPng();
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -27,7 +27,7 @@ try {
 try {
     $surface->writeToPng('', 1);
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
@@ -35,7 +35,7 @@ try {
 try {
     $surface->writeToPng(array());
     trigger_error('We should bomb here');
-} catch (CairoException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 ?>
@@ -45,8 +45,8 @@ unlink(dirname(__FILE__) . '/test.png');
 unlink(dirname(__FILE__) . '/stream.png');
 ?>
 --EXPECTF--
-object(CairoImageSurface)#%d (0) {
+object(Cairo\Surface\Image)#%d (0) {
 }
-CairoSurface::writeToPng() expects exactly 1 parameter, 0 given
-CairoSurface::writeToPng() expects exactly 1 parameter, 2 given
-CairoSurface::writeToPng() expects parameter 1 to be a string or a stream resource
\ No newline at end of file
+Cairo\Surface::writeToPng() expects exactly 1 parameter, 0 given
+Cairo\Surface::writeToPng() expects exactly 1 parameter, 2 given
+Cairo\Surface::writeToPng() expects parameter 1 to be a string or a stream resource
\ No newline at end of file
diff --git a/tests/Enums/Extend.phpt b/tests/Enums/Extend.phpt
index eba882ad..36ec6132 100644
--- a/tests/Enums/Extend.phpt
+++ b/tests/Enums/Extend.phpt
@@ -18,14 +18,14 @@ object(Cairo\Extend)#%d (2) {
   ["__elements"]=>
   array(4) {
     ["NONE"]=>
-    int(0)
+    long(0)
     ["REPEAT"]=>
-    int(1)
+    long(1)
     ["REFLECT"]=>
-    int(2)
+    long(2)
     ["PAD"]=>
-    int(3)
+    long(3)
   }
   ["__value"]=>
-  int(0)
+  long(0)
 }
\ No newline at end of file
diff --git a/tests/Enums/Filter.phpt b/tests/Enums/Filter.phpt
index 0d30c52a..d3f3b1a2 100644
--- a/tests/Enums/Filter.phpt
+++ b/tests/Enums/Filter.phpt
@@ -18,18 +18,18 @@ object(Cairo\Filter)#%d (2) {
   ["__elements"]=>
   array(6) {
     ["FAST"]=>
-    int(0)
+    long(0)
     ["GOOD"]=>
-    int(1)
+    long(1)
     ["BEST"]=>
-    int(2)
+    long(2)
     ["NEAREST"]=>
-    int(3)
+    long(3)
     ["BILINEAR"]=>
-    int(4)
+    long(4)
     ["GAUSSIAN"]=>
-    int(5)
+    long(5)
   }
   ["__value"]=>
-  int(0)
+  long(0)
 }
\ No newline at end of file
diff --git a/tests/Enums/Pattern_Type.phpt b/tests/Enums/Pattern_Type.phpt
index a2961be8..f066f35f 100644
--- a/tests/Enums/Pattern_Type.phpt
+++ b/tests/Enums/Pattern_Type.phpt
@@ -18,18 +18,18 @@ object(Cairo\Pattern\Type)#%d (2) {
   ["__elements"]=>
   array(6) {
     ["SOLID"]=>
-    int(0)
+    long(0)
     ["SURFACE"]=>
-    int(1)
+    long(1)
     ["LINEAR"]=>
-    int(2)
+    long(2)
     ["RADIAL"]=>
-    int(3)
+    long(3)
     ["MESH"]=>
-    int(4)
+    long(4)
     ["RASTER_SOURCE"]=>
-    int(5)
+    long(5)
   }
   ["__value"]=>
-  int(0)
+  long(0)
 }
\ No newline at end of file
diff --git a/tests/Enums/Status.phpt b/tests/Enums/Status.phpt
index 67e99e0f..48d91eea 100644
--- a/tests/Enums/Status.phpt
+++ b/tests/Enums/Status.phpt
@@ -104,7 +104,7 @@ object(Cairo\Status)#%d (2) {
     ["JBIG2_GLOBAL_MISSING"]=>
     int(38)
     ["LAST_STATUS"]=>
-    int(39)
+    int(43)
   }
   ["__value"]=>
   int(0)
diff --git a/tests/Matrix/multiply.phpt b/tests/Matrix/multiply.phpt
index f090ab30..6e82f61d 100644
--- a/tests/Matrix/multiply.phpt
+++ b/tests/Matrix/multiply.phpt
@@ -74,5 +74,5 @@ object(Cairo\Matrix)#%d (6) {
 Cairo\Matrix::multiply() expects exactly 2 parameters, 0 given
 Cairo\Matrix::multiply() expects exactly 2 parameters, 1 given
 Cairo\Matrix::multiply() expects exactly 2 parameters, 3 given
-Cairo\Matrix::multiply() expects parameter 1 to be Cairo\Matrix, integer given
-Cairo\Matrix::multiply() expects parameter 2 to be Cairo\Matrix, integer given
\ No newline at end of file
+Cairo\Matrix::multiply() expects parameter 1 to be Cairo\Matrix, int given
+Cairo\Matrix::multiply() expects parameter 2 to be Cairo\Matrix, int given
\ No newline at end of file
diff --git a/tests/Pattern/Gradient/Radial/getColorStopCount.phpt b/tests/Pattern/Gradient/Radial/getColorStopCount.phpt
index c51158ba..04f53398 100644
--- a/tests/Pattern/Gradient/Radial/getColorStopCount.phpt
+++ b/tests/Pattern/Gradient/Radial/getColorStopCount.phpt
@@ -32,6 +32,6 @@ try {
 }
 ?>
 --EXPECT--
-int(0)
-int(3)
+long(0)
+long(3)
 Cairo\Pattern\Gradient::getColorStopCount() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/Pattern/Gradient/Radial/getColorStopRgba.phpt b/tests/Pattern/Gradient/Radial/getColorStopRgba.phpt
index 1b2eff13..661142a8 100644
--- a/tests/Pattern/Gradient/Radial/getColorStopRgba.phpt
+++ b/tests/Pattern/Gradient/Radial/getColorStopRgba.phpt
@@ -50,4 +50,4 @@ array(4) {
 }
 Cairo\Pattern\Gradient::getColorStopRgba() expects exactly 1 parameter, 0 given
 Cairo\Pattern\Gradient::getColorStopRgba() expects exactly 1 parameter, 2 given
-Cairo\Pattern\Gradient::getColorStopRgba() expects parameter 1 to be integer, array given
\ No newline at end of file
+Cairo\Pattern\Gradient::getColorStopRgba() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/Pattern/Mesh/beginPatch.phpt b/tests/Pattern/Mesh/beginPatch.phpt
index 1209a505..354a10c7 100644
--- a/tests/Pattern/Mesh/beginPatch.phpt
+++ b/tests/Pattern/Mesh/beginPatch.phpt
@@ -37,7 +37,7 @@ try {
 }
 ?>
 --EXPECT--
-int(0)
-int(1)
+long(0)
+long(1)
 invalid operation during mesh pattern construction
 Cairo\Pattern\Mesh::beginPatch() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/Pattern/Mesh/endPatch.phpt b/tests/Pattern/Mesh/endPatch.phpt
index f33b227e..26370680 100644
--- a/tests/Pattern/Mesh/endPatch.phpt
+++ b/tests/Pattern/Mesh/endPatch.phpt
@@ -34,5 +34,5 @@ try {
 ?>
 --EXPECT--
 invalid operation during mesh pattern construction
-int(1)
+long(1)
 Cairo\Pattern\Mesh::endPatch() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/Pattern/Solid/setExtend.phpt b/tests/Pattern/Solid/setExtend.phpt
index 55e520df..b56cda2d 100644
--- a/tests/Pattern/Solid/setExtend.phpt
+++ b/tests/Pattern/Solid/setExtend.phpt
@@ -56,5 +56,5 @@ bool(true)
 bool(true)
 Cairo\Pattern::setExtend() expects exactly 1 parameter, 0 given
 Cairo\Pattern::setExtend() expects exactly 1 parameter, 2 given
-Cairo\Pattern::setExtend() expects parameter 1 to be integer, array given
+Cairo\Pattern::setExtend() expects parameter 1 to be int, array given
 Value 999 provided is not a const in enum Cairo\Extend
\ No newline at end of file
diff --git a/tests/Pattern/Solid/setFilter.phpt b/tests/Pattern/Solid/setFilter.phpt
index 9b4f6b03..846ac773 100755
--- a/tests/Pattern/Solid/setFilter.phpt
+++ b/tests/Pattern/Solid/setFilter.phpt
@@ -55,5 +55,5 @@ bool(true)
 bool(true)
 Cairo\Pattern::setFilter() expects exactly 1 parameter, 0 given
 Cairo\Pattern::setFilter() expects exactly 1 parameter, 2 given
-Cairo\Pattern::setFilter() expects parameter 1 to be integer, array given
+Cairo\Pattern::setFilter() expects parameter 1 to be int, array given
 Value 999 provided is not a const in enum Cairo\Filter
\ No newline at end of file
diff --git a/tests/Pattern/Solid/setMatrix.phpt b/tests/Pattern/Solid/setMatrix.phpt
index 2511dc04..de4f697a 100644
--- a/tests/Pattern/Solid/setMatrix.phpt
+++ b/tests/Pattern/Solid/setMatrix.phpt
@@ -52,5 +52,5 @@ try {
 bool(true)
 bool(true)
 Cairo\Pattern::setMatrix() expects exactly 1 parameter, 0 given
-Argument 1 passed to Cairo\Pattern::setMatrix() must be an instance of Cairo\Matrix, integer given
-Argument 1 passed to Cairo\Pattern::setMatrix() must be an instance of Cairo\Matrix, integer given
\ No newline at end of file
+Argument 1 passed to Cairo\Pattern::setMatrix() must be an instance of Cairo\Matrix, int given
+Argument 1 passed to Cairo\Pattern::setMatrix() must be an instance of Cairo\Matrix, int given
\ No newline at end of file
diff --git a/tests/Pattern/Surface/__construct.phpt b/tests/Pattern/Surface/__construct.phpt
index b3b312eb..2846d23b 100755
--- a/tests/Pattern/Surface/__construct.phpt
+++ b/tests/Pattern/Surface/__construct.phpt
@@ -43,4 +43,4 @@ object(Cairo\Pattern\Surface)#%d (0) {
 }
 Cairo\Pattern\Surface::__construct() expects exactly 1 parameter, 0 given
 Cairo\Pattern\Surface::__construct() expects exactly 1 parameter, 2 given
-Argument 1 passed to Cairo\Pattern\Surface::__construct() must be an instance of Cairo\Surface, integer given
\ No newline at end of file
+Argument 1 passed to Cairo\Pattern\Surface::__construct() must be an instance of Cairo\Surface, int given
\ No newline at end of file
diff --git a/tests/Pattern/Surface/getExtend.phpt b/tests/Pattern/Surface/getExtend.phpt
index 82b459b2..7c19c95b 100755
--- a/tests/Pattern/Surface/getExtend.phpt
+++ b/tests/Pattern/Surface/getExtend.phpt
@@ -33,16 +33,16 @@ object(Cairo\Extend)#%d (2) {
   ["__elements"]=>
   array(4) {
     ["NONE"]=>
-    int(0)
+    long(0)
     ["REPEAT"]=>
-    int(1)
+    long(1)
     ["REFLECT"]=>
-    int(2)
+    long(2)
     ["PAD"]=>
-    int(3)
+    long(3)
   }
   ["__value"]=>
-  int(0)
+  long(0)
 }
 bool(true)
 Cairo\Pattern::getExtend() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/Pattern/Surface/getFilter.phpt b/tests/Pattern/Surface/getFilter.phpt
index 3b46a5e2..917b6dee 100755
--- a/tests/Pattern/Surface/getFilter.phpt
+++ b/tests/Pattern/Surface/getFilter.phpt
@@ -34,20 +34,20 @@ object(Cairo\Filter)#%d (2) {
   ["__elements"]=>
   array(6) {
     ["FAST"]=>
-    int(0)
+    long(0)
     ["GOOD"]=>
-    int(1)
+    long(1)
     ["BEST"]=>
-    int(2)
+    long(2)
     ["NEAREST"]=>
-    int(3)
+    long(3)
     ["BILINEAR"]=>
-    int(4)
+    long(4)
     ["GAUSSIAN"]=>
-    int(5)
+    long(5)
   }
   ["__value"]=>
-  int(1)
+  long(1)
 }
 bool(true)
 Cairo\Pattern::getFilter() expects exactly 0 parameters, 1 given
\ No newline at end of file
diff --git a/tests/Pattern/Surface/setExtend.phpt b/tests/Pattern/Surface/setExtend.phpt
index 49cbddae..e066b4e9 100755
--- a/tests/Pattern/Surface/setExtend.phpt
+++ b/tests/Pattern/Surface/setExtend.phpt
@@ -52,18 +52,18 @@ object(Cairo\Extend)#3 (2) {
   ["__elements"]=>
   array(4) {
     ["NONE"]=>
-    int(0)
+    long(0)
     ["REPEAT"]=>
-    int(1)
+    long(1)
     ["REFLECT"]=>
-    int(2)
+    long(2)
     ["PAD"]=>
-    int(3)
+    long(3)
   }
   ["__value"]=>
-  int(3)
+  long(3)
 }
 bool(true)
 Cairo\Pattern::setExtend() expects exactly 1 parameter, 0 given
 Cairo\Pattern::setExtend() expects exactly 1 parameter, 2 given
-Cairo\Pattern::setExtend() expects parameter 1 to be integer, array given
\ No newline at end of file
+Cairo\Pattern::setExtend() expects parameter 1 to be int, array given
\ No newline at end of file
diff --git a/tests/Pattern/Surface/setFilter.phpt b/tests/Pattern/Surface/setFilter.phpt
index ab7b298a..476103b2 100755
--- a/tests/Pattern/Surface/setFilter.phpt
+++ b/tests/Pattern/Surface/setFilter.phpt
@@ -59,5 +59,5 @@ bool(true)
 bool(true)
 Cairo\Pattern::setFilter() expects exactly 1 parameter, 0 given
 Cairo\Pattern::setFilter() expects exactly 1 parameter, 2 given
-Cairo\Pattern::setFilter() expects parameter 1 to be integer, array given
+Cairo\Pattern::setFilter() expects parameter 1 to be int, array given
 Value 999 provided is not a const in enum Cairo\Filter
\ No newline at end of file
diff --git a/tests/Rectangle/__construct.phpt b/tests/Rectangle/__construct.phpt
index 67c2d1b3..d3b3c2b9 100644
--- a/tests/Rectangle/__construct.phpt
+++ b/tests/Rectangle/__construct.phpt
@@ -60,7 +60,7 @@ object(Cairo\Rectangle)#%d (4) {
   int(0)
 }
 Cairo\Rectangle::__construct() expects at most 4 parameters, 5 given
-Cairo\Rectangle::__construct() expects parameter 1 to be integer, array given
-Cairo\Rectangle::__construct() expects parameter 2 to be integer, array given
-Cairo\Rectangle::__construct() expects parameter 3 to be integer, array given
-Cairo\Rectangle::__construct() expects parameter 4 to be integer, array given
+Cairo\Rectangle::__construct() expects parameter 1 to be int, array given
+Cairo\Rectangle::__construct() expects parameter 2 to be int, array given
+Cairo\Rectangle::__construct() expects parameter 3 to be int, array given
+Cairo\Rectangle::__construct() expects parameter 4 to be int, array given