diff --git a/tests/data/good_maps/point_symbolizer.xml b/tests/data/good_maps/point_symbolizer.xml
index 00b4b06c4..f5347bdc8 100644
--- a/tests/data/good_maps/point_symbolizer.xml
+++ b/tests/data/good_maps/point_symbolizer.xml
@@ -1,33 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE Map  >
-<Map bgcolor="#b5d0d0" srs="+proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs" min_version="0.7.1">
-    <Style name="test 1">
-        <Rule name="rule t1">
-            <Filter>[landuse] = 'meadow' or [landuse] = 'wood' or [landuse] = 'forest'</Filter>
-            <MinScaleDenominator>1000</MinScaleDenominator>
-            <PointSymbolizer/>
-        </Rule>
-    </Style>
-    <Style name="test 2">
+<Map bgcolor="#b5d0d0" srs="+init=epsg:4326" min_version="0.7.1">
+    <Style name="1">
         <Rule title="foo">
-            <ElseFilter/>
-            <MaxScaleDenominator>1000000</MaxScaleDenominator>
-            <PointSymbolizer file="../images/dummy.png" type="png" width="16" height="16"/>
+            <Filter>([name]='Australia')</Filter>
+            <TextSymbolizer face_name="DejaVu Sans Book" size="10" 
+            name="[name] + ' (png)'"  halo_radius="1" dy="20"/>
+            <PointSymbolizer file="../images/dummy.png" type="png" dy="-10" width="16" height="16" allow_overlap="true"/>
+        </Rule>
+        <Rule title="foo1">
+            <Filter>([name]='Brazil')</Filter>
+            <TextSymbolizer face_name="DejaVu Sans Book" size="10" 
+            name="[name] + ' (svg &amp; tif)'"  halo_radius="1" dy="20"/>
+            <PointSymbolizer file="../images/dummy.tif" type="tif" allow_overlap="true"/>
+            <PointSymbolizer file="../svg/ellipses.svg" allow_overlap="true"/>
         </Rule>
-    </Style>
-    <Style name="test 3">
         <Rule title="foo">
-            <PointSymbolizer file="../images/dummy.png" type="png"/>
+            <Filter>([name]='Mongolia')</Filter>
+            <TextSymbolizer face_name="DejaVu Sans Book" size="10" 
+            name="[name] + ' (tiff)'"  halo_radius="1" dy="20"/>
+            <PointSymbolizer file="../images/dummy.tiff" width="16" height="16" allow_overlap="true"/>
         </Rule>
-    </Style>
-    <Style name="test 4">
         <Rule title="foo">
-            <PointSymbolizer file="../images/dummy.png" width="16" height="16"/>
+            <Filter>([name]='Sudan')</Filter>
+            <TextSymbolizer face_name="DejaVu Sans Book" size="10" 
+            name="[name] + ' (jpeg)'"  halo_radius="1" dy="20"/>
+            <PointSymbolizer file="../images/dummy.jpeg" type="jpeg" />
         </Rule>
-    </Style>
-    <Style name="test 5">
         <Rule title="foo">
-            <PointSymbolizer file="../images/dummy.png"/>
+            <Filter>([name]='United States')</Filter>
+            <TextSymbolizer face_name="DejaVu Sans Book" size="10" 
+            name="[name] + ' (jpg)'"  halo_radius="1" dy="20"/>
+            <PointSymbolizer file="../images/dummy.jpg" type="jpg" width="5" height="10" />
+        </Rule>
+        <Rule title="foo">
+            <ElseFilter />
+            <TextSymbolizer face_name="DejaVu Sans Book" size="10" 
+            name="[name]"  halo_radius="1" dy="20"/>
+            <PointSymbolizer file="../images/bogus_will_fail.png"/>
         </Rule>
     </Style>
+
+    <Layer name="point" srs="+init=epsg:4326">
+        <StyleName>1</StyleName>
+        <Datasource>
+            <Parameter name="extent">-180,-60,180,60</Parameter>
+            <Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
+            <Parameter name="geometry_field">geometry</Parameter>
+            <Parameter name="key_field">pkuid</Parameter>
+            <Parameter name="table">point</Parameter>
+            <Parameter name="type">sqlite</Parameter>
+            <Parameter name="use_spatial_index">1</Parameter>
+            <Parameter name="wkb_format">spatialite</Parameter>
+        </Datasource>
+    </Layer>
+
 </Map>
diff --git a/tests/data/good_maps/sqlite.xml b/tests/data/good_maps/sqlite.xml
new file mode 100644
index 000000000..2114284db
--- /dev/null
+++ b/tests/data/good_maps/sqlite.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Map srs="+init=epsg:4326" bgcolor="rgb(255,255,255)">
+    <Style name="point_style">
+        <Rule>
+            <PointSymbolizer file="../images/point.svg"/>
+            <TextSymbolizer face_name="DejaVu Sans Book" size="12" name="[name]" halo_fill="rgb(255,255,255,100)" halo_radius="1" dy="-5"/>
+        </Rule>
+    </Style>
+    <Style name="world_borders_style">
+        <Rule>
+            <PolygonSymbolizer fill="grey" gamma="0.7"/>
+        </Rule>
+    </Style>
+    <Layer name="world_borders" srs="+proj=merc +lon_0=0 +lat_ts=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs">
+        <StyleName>world_borders_style</StyleName>
+        <Datasource>
+            <Parameter name="file">../shp/world_merc.shp</Parameter>
+            <Parameter name="type">shape</Parameter>
+        </Datasource>
+    </Layer>
+    <Layer name="point" srs="+init=epsg:4326">
+        <StyleName>point_style</StyleName>
+        <Datasource>
+            <Parameter name="extent">-100.276283619,-23.5207203374,136.782396088,45.7946830856</Parameter>
+            <Parameter name="file">../sqlite/qgis_spatiallite.sqlite</Parameter>
+            <Parameter name="geometry_field">geometry</Parameter>
+            <Parameter name="key_field">pkuid</Parameter>
+            <Parameter name="table">point</Parameter>
+            <Parameter name="type">sqlite</Parameter>
+            <Parameter name="use_spatial_index">1</Parameter>
+            <Parameter name="wkb_format">spatialite</Parameter>
+        </Datasource>
+    </Layer>
+</Map>
\ No newline at end of file
diff --git a/tests/data/images/dummy.jpeg b/tests/data/images/dummy.jpeg
new file mode 100644
index 000000000..81e1a8095
Binary files /dev/null and b/tests/data/images/dummy.jpeg differ
diff --git a/tests/data/images/dummy.jpg b/tests/data/images/dummy.jpg
new file mode 100644
index 000000000..81e1a8095
Binary files /dev/null and b/tests/data/images/dummy.jpg differ
diff --git a/tests/data/images/dummy.tif b/tests/data/images/dummy.tif
new file mode 100644
index 000000000..7c20279e5
Binary files /dev/null and b/tests/data/images/dummy.tif differ
diff --git a/tests/data/images/dummy.tiff b/tests/data/images/dummy.tiff
new file mode 100644
index 000000000..7c20279e5
Binary files /dev/null and b/tests/data/images/dummy.tiff differ
diff --git a/tests/data/sqlite/qgis_spatiallite.sqlite b/tests/data/sqlite/qgis_spatiallite.sqlite
new file mode 100644
index 000000000..4578c686f
Binary files /dev/null and b/tests/data/sqlite/qgis_spatiallite.sqlite differ
diff --git a/tests/data/svg/ellipses.svg b/tests/data/svg/ellipses.svg
new file mode 100644
index 000000000..99633ce06
--- /dev/null
+++ b/tests/data/svg/ellipses.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="100%" height="100%" version="1.1"
+xmlns="http://www.w3.org/2000/svg">
+
+<ellipse cy="-20" rx="10" ry="4" fill="green"/>
+<ellipse cy="-20" rx="4" ry="10" fill="blue"/>
+<circle cy="-20" r="5" stroke="green" stroke-width=".4" fill="red"/>
+
+</svg>
+
diff --git a/tests/data/svg/point.svg b/tests/data/svg/point.svg
new file mode 100644
index 000000000..364da3cf8
--- /dev/null
+++ b/tests/data/svg/point.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="100%" height="100%" version="1.1"
+xmlns="http://www.w3.org/2000/svg">
+
+<circle cx="0" cy="0" r="5" stroke="green" stroke-width=".4" fill="red"/>
+
+</svg>
+