diff --git a/tests/visual_tests/styles/expressionformat.xml b/tests/visual_tests/styles/expressionformat.xml
index 919430f97..81c7b65c3 100644
--- a/tests/visual_tests/styles/expressionformat.xml
+++ b/tests/visual_tests/styles/expressionformat.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-1.xml b/tests/visual_tests/styles/formatting-1.xml
index 15f512abf..7bb62f15f 100644
--- a/tests/visual_tests/styles/formatting-1.xml
+++ b/tests/visual_tests/styles/formatting-1.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-2.xml b/tests/visual_tests/styles/formatting-2.xml
index 635af6a39..ca7646a47 100644
--- a/tests/visual_tests/styles/formatting-2.xml
+++ b/tests/visual_tests/styles/formatting-2.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-3.xml b/tests/visual_tests/styles/formatting-3.xml
index 97a5fb1f2..eb9e449fe 100644
--- a/tests/visual_tests/styles/formatting-3.xml
+++ b/tests/visual_tests/styles/formatting-3.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/formatting-4.xml b/tests/visual_tests/styles/formatting-4.xml
index b09f59a26..984a654fb 100644
--- a/tests/visual_tests/styles/formatting-4.xml
+++ b/tests/visual_tests/styles/formatting-4.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/jalign-auto.xml b/tests/visual_tests/styles/jalign-auto.xml
index f59f31cba..2ee79edd5 100644
--- a/tests/visual_tests/styles/jalign-auto.xml
+++ b/tests/visual_tests/styles/jalign-auto.xml
@@ -5,14 +5,14 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = '5'</Filter>
+            <Filter>[nr] = 5</Filter>
             <PointSymbolizer/>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="-30" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
             <TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dx="0" dy="-30" justify-alignment="auto">'Text line 1&#10;line 2'</TextSymbolizer>
diff --git a/tests/visual_tests/styles/line-offset.xml b/tests/visual_tests/styles/line-offset.xml
index 5218ac2fc..8f4dee7ae 100644
--- a/tests/visual_tests/styles/line-offset.xml
+++ b/tests/visual_tests/styles/line-offset.xml
@@ -4,8 +4,8 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/line-offset.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/line-offset.csv</Parameter>
         </Datasource>
     </Layer>
 
@@ -14,15 +14,15 @@
             <LineSymbolizer/>
         </Rule>
         <Rule>
-            <Filter>[ref]='1' or [ref]='3'</Filter>
+            <Filter>[ref]=1 or [ref]=3</Filter>
             <TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="-10" vertical-alignment="middle">'Some Text'</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[ref]='2' or [ref]='4'</Filter>
+            <Filter>[ref]=2 or [ref]=4</Filter>
             <TextSymbolizer size="14" fill="#000" spacing="1" placement="line" face-name="DejaVu Sans Book" halo-radius="1" dy="10" vertical-alignment="middle">'Some Text'</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[name]!=''</Filter>
+            <Filter>[name]</Filter>
             <TextSymbolizer size="10" fill="#000" placement="line" face-name="DejaVu Sans Book" halo-radius="1">[name]</TextSymbolizer>
         </Rule>
     </Style>
diff --git a/tests/visual_tests/styles/lines-1.xml b/tests/visual_tests/styles/lines-1.xml
index dfd534efb..086f99205 100644
--- a/tests/visual_tests/styles/lines-1.xml
+++ b/tests/visual_tests/styles/lines-1.xml
@@ -5,13 +5,14 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/lines.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/lines.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
+            <Filter>[mapnik::geometry_type]=linestring</Filter>
             <LineSymbolizer stroke-width="12" stroke="red"/>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line">[name]</TextSymbolizer>
         </Rule>
diff --git a/tests/visual_tests/styles/lines-2.xml b/tests/visual_tests/styles/lines-2.xml
index 2f541ff43..9ea6e585c 100644
--- a/tests/visual_tests/styles/lines-2.xml
+++ b/tests/visual_tests/styles/lines-2.xml
@@ -5,13 +5,14 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/lines.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/lines.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
+            <Filter>[mapnik::geometry_type]=linestring</Filter>
             <LineSymbolizer stroke-width="12" stroke="red"/>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line">[name]<Format size="8" fill="blue">[name]</Format></TextSymbolizer>
         </Rule>
diff --git a/tests/visual_tests/styles/lines-3.xml b/tests/visual_tests/styles/lines-3.xml
index 9aa10b2fc..3164b2349 100644
--- a/tests/visual_tests/styles/lines-3.xml
+++ b/tests/visual_tests/styles/lines-3.xml
@@ -5,13 +5,14 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/lines.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/lines.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
+            <Filter>[mapnik::geometry_type]=linestring</Filter>
             <LineSymbolizer stroke-width="12" stroke="red"/>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" spacing="20">[name]</TextSymbolizer>
         </Rule>
diff --git a/tests/visual_tests/styles/lines-shield.xml b/tests/visual_tests/styles/lines-shield.xml
index f255936d3..638439909 100644
--- a/tests/visual_tests/styles/lines-shield.xml
+++ b/tests/visual_tests/styles/lines-shield.xml
@@ -5,13 +5,14 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/lines.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/lines.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
+            <Filter>[mapnik::geometry_type]=linestring</Filter>
             <LineSymbolizer stroke-width="1" stroke="blue"/>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="line" file="../../data/svg/crosshair16x16.svg" spacing="30">'X'</ShieldSymbolizer>
         </Rule>
diff --git a/tests/visual_tests/styles/list.xml b/tests/visual_tests/styles/list.xml
index 61401dd90..50a189bd1 100644
--- a/tests/visual_tests/styles/list.xml
+++ b/tests/visual_tests/styles/list.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/rtl-point.xml b/tests/visual_tests/styles/rtl-point.xml
index ac765b488..5236f94ee 100644
--- a/tests/visual_tests/styles/rtl-point.xml
+++ b/tests/visual_tests/styles/rtl-point.xml
@@ -5,14 +5,14 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr]='5'</Filter>
+            <Filter>[nr]=5</Filter>
             <PointSymbolizer/>
             <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="0" dy="16" wrap-width="10">'مخيّم دير البلح'</TextSymbolizer>
         </Rule>
diff --git a/tests/visual_tests/styles/shieldsymbolizer-1.xml b/tests/visual_tests/styles/shieldsymbolizer-1.xml
index 95fd70c45..0af96590a 100644
--- a/tests/visual_tests/styles/shieldsymbolizer-1.xml
+++ b/tests/visual_tests/styles/shieldsymbolizer-1.xml
@@ -6,50 +6,50 @@
     <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
         <StyleName>My Style</StyleName>
         <Datasource>
-            <Parameter name="type">osm</Parameter>
-            <Parameter name="file">../data/points.osm</Parameter>
+            <Parameter name="type">csv</Parameter>
+            <Parameter name="file">../data/points.csv</Parameter>
         </Datasource>
     </Layer>
 
     <Style name="My Style">
         <Rule>
-            <Filter>[nr] = '1'</Filter>
+            <Filter>[nr] = 1</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '2'</Filter>
+            <Filter>[nr] = 2</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="middle" dx="5">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '3'</Filter>
+            <Filter>[nr] = 3</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" vertical-alignment="middle" dy="5">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '4'</Filter>
+            <Filter>[nr] = 4</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg"  dy="0" vertical-alignment="bottom">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '5'</Filter>
+            <Filter>[nr] = 5</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" vertical-alignment="top">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '6'</Filter>
+            <Filter>[nr] = 6</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="left">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '7'</Filter>
+            <Filter>[nr] = 7</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg" allow-overlap="true" horizontal-alignment="right">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '8'</Filter>
+            <Filter>[nr] = 8</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'X&#10;X&#10;X'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '9'</Filter>
+            <Filter>[nr] = 9</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/svg/crosshair16x16.svg">'XXX'</ShieldSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = '10'</Filter>
+            <Filter>[nr] = 10</Filter>
             <ShieldSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" file="../../data/images/crosshair16x16.png">'X'</ShieldSymbolizer>
         </Rule>
         <Rule>
diff --git a/tests/visual_tests/styles/simple-E.xml b/tests/visual_tests/styles/simple-E.xml
index 10504cacb..d937efa01 100644
--- a/tests/visual_tests/styles/simple-E.xml
+++ b/tests/visual_tests/styles/simple-E.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-N.xml b/tests/visual_tests/styles/simple-N.xml
index 5511aa537..a5e6eebdf 100644
--- a/tests/visual_tests/styles/simple-N.xml
+++ b/tests/visual_tests/styles/simple-N.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-NE.xml b/tests/visual_tests/styles/simple-NE.xml
index 7d1da73fb..8589c77d9 100644
--- a/tests/visual_tests/styles/simple-NE.xml
+++ b/tests/visual_tests/styles/simple-NE.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-NW.xml b/tests/visual_tests/styles/simple-NW.xml
index fe27a7852..c133eb16e 100644
--- a/tests/visual_tests/styles/simple-NW.xml
+++ b/tests/visual_tests/styles/simple-NW.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-S.xml b/tests/visual_tests/styles/simple-S.xml
index 657e83c86..2ceb0c594 100644
--- a/tests/visual_tests/styles/simple-S.xml
+++ b/tests/visual_tests/styles/simple-S.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-SE.xml b/tests/visual_tests/styles/simple-SE.xml
index 06d816a04..eea79a652 100644
--- a/tests/visual_tests/styles/simple-SE.xml
+++ b/tests/visual_tests/styles/simple-SE.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-SW.xml b/tests/visual_tests/styles/simple-SW.xml
index 2821a59a4..d7038b308 100644
--- a/tests/visual_tests/styles/simple-SW.xml
+++ b/tests/visual_tests/styles/simple-SW.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-W.xml b/tests/visual_tests/styles/simple-W.xml
index 1fc96d7cf..ea8258984 100644
--- a/tests/visual_tests/styles/simple-W.xml
+++ b/tests/visual_tests/styles/simple-W.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple-shield.xml b/tests/visual_tests/styles/simple-shield.xml
index 43503a570..2debb3773 100644
--- a/tests/visual_tests/styles/simple-shield.xml
+++ b/tests/visual_tests/styles/simple-shield.xml
@@ -5,8 +5,8 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
diff --git a/tests/visual_tests/styles/simple.xml b/tests/visual_tests/styles/simple.xml
index ef03765a0..a10fbdac5 100644
--- a/tests/visual_tests/styles/simple.xml
+++ b/tests/visual_tests/styles/simple.xml
@@ -5,15 +5,15 @@
   <Layer name="layer" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
     <StyleName>My Style</StyleName>
     <Datasource>
-      <Parameter name="type">osm</Parameter>
-      <Parameter name="file">../data/points.osm</Parameter>
+      <Parameter name="type">csv</Parameter>
+      <Parameter name="file">../data/points.csv</Parameter>
     </Datasource>
   </Layer>
 
     <Style name="My Style">
     <Rule>
-      <PointSymbolizer/>
-      <TextSymbolizer face-name="DejaVu Sans Book" size="16" placement="point" dx="5" dy="16" placement-type="simple" placements="N,S,E,W,SW,10,5">[name]</TextSymbolizer>
+      <PointSymbolizer clip="false" />
+      <TextSymbolizer clip="false" face-name="DejaVu Sans Book" size="16" placement="point" dx="5" dy="16" placement-type="simple" placements="N,S,E,W,SW,10,5">[name]</TextSymbolizer>
     </Rule>
   </Style>
 
diff --git a/tests/visual_tests/styles/text-halo-rasterizer.xml b/tests/visual_tests/styles/text-halo-rasterizer.xml
index 9b8d028a3..cefcadb02 100644
--- a/tests/visual_tests/styles/text-halo-rasterizer.xml
+++ b/tests/visual_tests/styles/text-halo-rasterizer.xml
@@ -2,7 +2,29 @@
 
     <Style name="labels">
         <Rule>
-            <Filter>([id]=0)</Filter>
+            <Filter>([id]=0.1)</Filter>
+            <TextSymbolizer
+              face-name="DejaVu Sans Book"
+              size="15"
+              halo-rasterizer="fast"
+              halo-radius=".1"
+            >
+                'fast .1'
+            </TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>([id]=0.3)</Filter>
+            <TextSymbolizer
+              face-name="DejaVu Sans Book"
+              size="15"
+              halo-rasterizer="fast"
+              halo-radius=".3"
+            >
+                'fast .3'
+            </TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>([id]=0.5)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -13,7 +35,18 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=1)</Filter>
+            <Filter>([id]=0.7)</Filter>
+            <TextSymbolizer
+              face-name="DejaVu Sans Book"
+              size="15"
+              halo-rasterizer="fast"
+              halo-radius=".7"
+            >
+                'fast .7'
+            </TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>([id]=1.0)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -24,7 +57,7 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=2)</Filter>
+            <Filter>([id]=1.5)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -35,7 +68,7 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=3)</Filter>
+            <Filter>([id]=2.5)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -57,7 +90,27 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=5)</Filter>
+            <Filter>([id]=100.1)</Filter>
+            <TextSymbolizer
+              face-name="DejaVu Sans Book"
+              size="15"
+              halo-radius=".1"
+            >
+                'full .1'
+            </TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>([id]=100.3)</Filter>
+            <TextSymbolizer
+              face-name="DejaVu Sans Book"
+              size="15"
+              halo-radius=".3"
+            >
+                'full .3'
+            </TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>([id]=100.5)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -67,7 +120,17 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=6)</Filter>
+            <Filter>([id]=100.7)</Filter>
+            <TextSymbolizer
+              face-name="DejaVu Sans Book"
+              size="15"
+              halo-radius=".7"
+            >
+                'full .7'
+            </TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>([id]=101)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -77,7 +140,7 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=7)</Filter>
+            <Filter>([id]=101.5)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -87,7 +150,7 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=8)</Filter>
+            <Filter>([id]=102.5)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -97,7 +160,7 @@
             </TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>([id]=9)</Filter>
+            <Filter>([id]=104)</Filter>
             <TextSymbolizer
               face-name="DejaVu Sans Book"
               size="15"
@@ -114,17 +177,24 @@
             <Parameter name="type">csv</Parameter>
             <Parameter name="inline">
 id,x,y
-0,1.5,1
-1,1.5,2
-2,1.5,3
-3,1.5,4
-4,1.5,4.5
+0.1,1.5,4.5
+0.3,1.5,4
+0.5,1.5,3.5
+0.7,1.5,3
+1,1.5,2.5
+1.5,1.5,2
+2.5,1.5,1.5
+4,1.5,1
+
+100.1,3.5,4.5
+100.3,3.5,4
+100.5,3.5,3.5
+100.7,3.5,3
+101,3.5,2.5
+101.5,3.5,2
+102.5,3.5,1.5
+104,3.5,1
 
-5,3.5,1
-6,3.5,2
-7,3.5,3
-8,3.5,4
-9,3.5,4.5
             </Parameter>
         </Datasource>
     </Layer>