diff --git a/event/event_cache_test.go b/event/event_cache_test.go
index 065611312182bd527b53d52e433ccdacb276469b..73e79d95ece836ebf67d6d8dd8d874ce94b8fd6c 100644
--- a/event/event_cache_test.go
+++ b/event/event_cache_test.go
@@ -82,7 +82,7 @@ func TestSubReaping(t *testing.T) {
 		for i := 0; i < NUM_SUBS; i++ {
 			time.Sleep(2 * time.Millisecond)
 			go func() {
-				id, err := eSubs.add("WeirdEvent")
+				id, err := eSubs.Add("WeirdEvent")
 				if err != nil {
 					doneChan <- err
 					return
@@ -127,7 +127,7 @@ func TestSubManualClose(t *testing.T) {
 		for i := 0; i < NUM_SUBS; i++ {
 			time.Sleep(2 * time.Millisecond)
 			go func() {
-				id, err := eSubs.add("WeirdEvent")
+				id, err := eSubs.Add("WeirdEvent")
 				if err != nil {
 					doneChan <- err
 					return
@@ -141,7 +141,7 @@ func TestSubManualClose(t *testing.T) {
 					doneChan <- err2
 				}
 				time.Sleep(100 * time.Millisecond)
-				err3 := eSubs.remove(id)
+				err3 := eSubs.Remove(id)
 				if err3 != nil {
 					doneChan <- err3
 				}
@@ -176,7 +176,7 @@ func TestSubFlooding(t *testing.T) {
 		for i := 0; i < NUM_SUBS; i++ {
 			time.Sleep(1 * time.Millisecond)
 			go func() {
-				id, err := eSubs.add("WeirdEvent")
+				id, err := eSubs.Add("WeirdEvent")
 				if err != nil {
 					doneChan <- err
 					return
@@ -190,7 +190,7 @@ func TestSubFlooding(t *testing.T) {
 					doneChan <- err2
 				}
 				time.Sleep(1000 * time.Millisecond)
-				err3 := eSubs.remove(id)
+				err3 := eSubs.Remove(id)
 				if err3 != nil {
 					doneChan <- err3
 				}
diff --git a/rpc/tendermint/test/tests.go b/rpc/tendermint/test/tests.go
index 8b0552a54e79e6fa6da7c0b18caabb21f50f30aa..a200f56a7780251d02d1be82cefed143c15caccf 100644
--- a/rpc/tendermint/test/tests.go
+++ b/rpc/tendermint/test/tests.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	edbcli "github.com/eris-ltd/eris-db/rpc/client"
+	edbcli "github.com/eris-ltd/eris-db/rpc/tendermint/client"
 	"github.com/eris-ltd/eris-db/txs"
 
 	. "github.com/tendermint/go-common"
diff --git a/rpc/tendermint/test/ws_helpers.go b/rpc/tendermint/test/ws_helpers.go
index 5b0b88ed7038ce75c3903032476668e3315d713a..8ebe0041d6ebedbaa53a24e5f384c755ffd18bfb 100644
--- a/rpc/tendermint/test/ws_helpers.go
+++ b/rpc/tendermint/test/ws_helpers.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	txtypes "github.com/eris-ltd/eris-db/txs"
 	"github.com/tendermint/tendermint/types"