diff --git a/cache/diff_test.go b/cache/diff_test.go
index 1993cd7..e00fd1f 100644
--- a/cache/diff_test.go
+++ b/cache/diff_test.go
@@ -90,9 +90,10 @@ func BenchmarkWriteDiff(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		for w := 0; w < 5; w++ {
 			for n := 0; n < 200; n++ {
-				cache.addc <- idRef{id: int64(n), ref: int64(w)}
+				cache.Add(int64(n), int64(w))
 			}
 		}
+		cache.Flush()
 	}
 
 }
diff --git a/geom/geom_test.go b/geom/geom_test.go
index 658dd05..6db71e7 100644
--- a/geom/geom_test.go
+++ b/geom/geom_test.go
@@ -1,9 +1,10 @@
 package geom
 
 import (
+	"testing"
+
 	"github.com/omniscale/imposm3/element"
 	"github.com/omniscale/imposm3/geom/geos"
-	"testing"
 )
 
 func TestLineString(t *testing.T) {
diff --git a/mapping/matcher_test.go b/mapping/matcher_test.go
index 9a4b062..8e5efa2 100644
--- a/mapping/matcher_test.go
+++ b/mapping/matcher_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func BenchmarkTagMatch(b *testing.B) {
-	m, err := NewMapping("matcher_test_mapping.yml")
+	m, err := NewMapping("test_mapping.yml")
 	if err != nil {
 		b.Fatal(err)
 	}
diff --git a/parser/pbf/pbf_test.go b/parser/pbf/pbf_test.go
index d7de08c..a4d1bd4 100644
--- a/parser/pbf/pbf_test.go
+++ b/parser/pbf/pbf_test.go
@@ -3,7 +3,6 @@ package pbf
 import (
 	"bytes"
 	"compress/zlib"
-	"fmt"
 	"io"
 	"log"
 	"os"
@@ -15,13 +14,12 @@ import (
 
 func BenchmarkHello(b *testing.B) {
 	b.StopTimer()
-	pbf, err := Open("../azores.osm.pbf")
+	pbf, err := Open("./monaco-20150428.osm.pbf")
 	if err != nil {
 		panic(err)
 	}
 
 	for pos := range pbf.BlockPositions() {
-		fmt.Println(pos.size, pos.offset)
 		b.StartTimer()
 		for i := 0; i < b.N; i++ {
 			readPrimitiveBlock(pos)
@@ -43,7 +41,7 @@ func BenchmarkHello(b *testing.B) {
 func BenchmarkPrimitiveBlock(b *testing.B) {
 	b.StopTimer()
 
-	file, err := os.Open("../azores.osm.pbf")
+	file, err := os.Open("./monaco-20150428.osm.pbf")
 	if err != nil {
 		log.Panic(err)
 	}
@@ -52,8 +50,8 @@ func BenchmarkPrimitiveBlock(b *testing.B) {
 	var block = &osmpbf.PrimitiveBlock{}
 	var blob = &osmpbf.Blob{}
 
-	var size = 56092
-	var offset int64 = 197
+	var size = 79566
+	var offset int64 = 155
 
 	blobData := make([]byte, size)
 	file.Seek(offset, 0)