Cleanup test init

data/data_suite_test.go

diff --git a/data/data_suite_test.go b/data/data_suite_test.go
index 3dfc7be..0daef56 100644
--- a/data/data_suite_test.go
+++ b/data/data_suite_test.go
@@ -1,14 +1,33 @@
-package data
+package data_test
 
 import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
 	"testing"
+	"github.com/30x/apid"
+	"github.com/30x/apid/factory"
+	"io/ioutil"
+	"os"
 )
 
+var tmpDir string
+
+var _ = BeforeSuite(func() {
+	apid.Initialize(factory.DefaultServicesFactory())
+
+	var err error
+	config := apid.Config()
+	tmpDir, err = ioutil.TempDir("", "apid_test")
+	Expect(err).NotTo(HaveOccurred())
+	config.Set("local_storage_path", tmpDir)
+})
+
+var _ = AfterSuite(func() {
+	os.RemoveAll(tmpDir)
+})
+
 func TestEvents(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Data Suite")
 }
-

data/data_test.go

diff --git a/data/data_test.go b/data/data_test.go
index 8d5e475..85e6110 100644
--- a/data/data_test.go
+++ b/data/data_test.go
@@ -3,13 +3,10 @@
 import (
 	"fmt"
 	"github.com/30x/apid"
-	"github.com/30x/apid/factory"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"io/ioutil"
 	"log"
 	"math/rand"
-	"os"
 	"strconv"
 	"time"
 	"github.com/30x/apid/data"
@@ -24,26 +21,11 @@
 )
 
 var (
-	tmpDir string
 	r      *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano()))
 )
 
 var _ = Describe("Data Service", func() {
 
-	BeforeSuite(func() {
-		apid.Initialize(factory.DefaultServicesFactory())
-
-		var err error
-		config := apid.Config()
-		tmpDir, err = ioutil.TempDir("", "apid_test")
-		Expect(err).NotTo(HaveOccurred())
-		config.Set("local_storage_path", tmpDir)
-	})
-
-	AfterSuite(func() {
-		os.RemoveAll(tmpDir)
-	})
-
 	It("should not allow reserved id or version", func() {
 		_, err := apid.Data().DBForID("common")
 		Expect(err).To(HaveOccurred())

events/event_manager.go

diff --git a/events/event_manager.go b/events/event_manager.go
index c7d4393..2caf925 100644
--- a/events/event_manager.go
+++ b/events/event_manager.go
@@ -12,14 +12,14 @@
 }
 
 func (em *eventManager) Emit(selector apid.EventSelector, event apid.Event) {
-	log.Debugf("emit selector: '%s' event: %s", selector, event)
+	log.Debugf("emit selector: '%s' event: %v", selector, event)
 	if !em.dispatchers[selector].Send(event) {
 		em.sendDelivered(selector, event, 0) // in case of no dispatcher
 	}
 }
 
 func (em *eventManager) EmitWithCallback(selector apid.EventSelector, event apid.Event, callback apid.EventHandlerFunc) {
-	log.Debugf("emit with callback selector: '%s' event: %s", selector, event)
+	log.Debugf("emit with callback selector: '%s' event: %v", selector, event)
 
 	handler := &funcWrapper{em, nil}
 	handler.HandlerFunc = func(e apid.Event) {
@@ -40,7 +40,7 @@
 }
 
 func (em *eventManager) Listen(selector apid.EventSelector, handler apid.EventHandler) {
-	log.Debugf("listen: '%s' handler: %s", selector, handler)
+	log.Debugf("listen: '%s' handler: %v", selector, handler)
 	if em.dispatchers == nil {
 		em.dispatchers = make(map[apid.EventSelector]*dispatcher)
 	}
@@ -53,7 +53,7 @@
 }
 
 func (em *eventManager) StopListening(selector apid.EventSelector, handler apid.EventHandler) {
-	log.Debugf("stop listening: '%s' handler: %s", selector, handler)
+	log.Debugf("stop listening: '%s' handler: %v", selector, handler)
 	if em.dispatchers == nil {
 		return
 	}
@@ -61,13 +61,13 @@
 }
 
 func (em *eventManager) ListenFunc(selector apid.EventSelector, handlerFunc apid.EventHandlerFunc) {
-	log.Debugf("listenFunc: '%s' handler: %s", selector, handlerFunc)
+	log.Debugf("listenFunc: '%s' handler: %v", selector, handlerFunc)
 	handler := &funcWrapper{em, handlerFunc}
 	em.Listen(selector, handler)
 }
 
 func (em *eventManager) ListenOnceFunc(selector apid.EventSelector, handlerFunc apid.EventHandlerFunc) {
-	log.Debugf("listenOnceFunc: '%s' handler: %s", selector, handlerFunc)
+	log.Debugf("listenOnceFunc: '%s' handler: %v", selector, handlerFunc)
 	handler := &funcWrapper{em, nil}
 	handler.HandlerFunc = func(event apid.Event) {
 		em.StopListening(selector, handler)

events/events_suite_test.go

diff --git a/events/events_suite_test.go b/events/events_suite_test.go
index 79b1bbf..478c54d 100644
--- a/events/events_suite_test.go
+++ b/events/events_suite_test.go
@@ -5,8 +5,15 @@
 	. "github.com/onsi/gomega"
 
 	"testing"
+	"github.com/30x/apid"
+	"github.com/30x/apid/factory"
 )
 
+var _ = BeforeSuite(func() {
+	apid.Initialize(factory.DefaultServicesFactory())
+})
+
+
 func TestEvents(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Events Suite")

events/events_test.go

diff --git a/events/events_test.go b/events/events_test.go
index d080c91..ab7a3bf 100644
--- a/events/events_test.go
+++ b/events/events_test.go
@@ -3,7 +3,6 @@
 import (
 	"github.com/30x/apid"
 	"github.com/30x/apid/events"
-	"github.com/30x/apid/factory"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"sync/atomic"
@@ -11,10 +10,6 @@
 
 var _ = Describe("Events Service", func() {
 
-	BeforeSuite(func() {
-		apid.Initialize(factory.DefaultServicesFactory())
-	})
-
 	It("should ignore event with no listeners", func() {
 		em := events.CreateService()
 		defer em.Close()