diff --git a/examples/bmp/BUILD.bazel b/examples/bmp/BUILD.bazel
index 63c52adaba65907513eda97e260a79955d622d34..66cf5d6efb5b53bdb99944da2591fc4997b753b6 100644
--- a/examples/bmp/BUILD.bazel
+++ b/examples/bmp/BUILD.bazel
@@ -6,7 +6,7 @@ go_library(
     importpath = "github.com/bio-routing/bio-rd/examples/bmp",
     visibility = ["//visibility:private"],
     deps = [
-        "//protocols/bmp/server:go_default_library",
+        "//protocols/bgp/server:go_default_library",
         "//routingtable/locRIB:go_default_library",
         "//vendor/github.com/sirupsen/logrus:go_default_library",
     ],
diff --git a/protocols/bgp/server/BUILD.bazel b/protocols/bgp/server/BUILD.bazel
index bd45a72d0abd1f419175febf884094109f6eb982..ea2b4ea6a2c5d575297404967aa5c6eee28eb900 100644
--- a/protocols/bgp/server/BUILD.bazel
+++ b/protocols/bgp/server/BUILD.bazel
@@ -3,6 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "bmp_router.go",
+        "bmp_server.go",
         "fake_conn.go",
         "fsm.go",
         "fsm_active.go",
@@ -29,6 +31,7 @@ go_library(
         "//net:go_default_library",
         "//protocols/bgp/packet:go_default_library",
         "//protocols/bgp/types:go_default_library",
+        "//protocols/bmp/packet:go_default_library",
         "//route:go_default_library",
         "//routingtable:go_default_library",
         "//routingtable/adjRIBIn:go_default_library",
@@ -36,12 +39,15 @@ go_library(
         "//routingtable/filter:go_default_library",
         "//routingtable/locRIB:go_default_library",
         "//vendor/github.com/sirupsen/logrus:go_default_library",
+        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = [
+        "bmp_router_test.go",
+        "bmp_server_test.go",
         "fsm_address_family_test.go",
         "fsm_open_sent_test.go",
         "fsm_test.go",
@@ -55,11 +61,14 @@ go_test(
         "//net:go_default_library",
         "//protocols/bgp/packet:go_default_library",
         "//protocols/bgp/types:go_default_library",
+        "//protocols/bmp/packet:go_default_library",
         "//route:go_default_library",
         "//routingtable:go_default_library",
+        "//routingtable/adjRIBIn:go_default_library",
         "//routingtable/filter:go_default_library",
         "//routingtable/locRIB:go_default_library",
         "//testing:go_default_library",
+        "//vendor/github.com/sirupsen/logrus:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
     ],
 )
diff --git a/protocols/bgp/server/fsm_address_family.go b/protocols/bgp/server/fsm_address_family.go
index af5318e4186efb714224dd503ed562fdc4b925de..01ee06b7533385f4358c0823298e936f407cb49b 100644
--- a/protocols/bgp/server/fsm_address_family.go
+++ b/protocols/bgp/server/fsm_address_family.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"fmt"
 	"time"
 
 	bnet "github.com/bio-routing/bio-rd/net"
@@ -114,8 +113,7 @@ func (f *fsmAddressFamily) updates(u *packet.BGPUpdate) {
 		path := f.newRoutePath()
 		f.processAttributes(u.PathAttributes, path)
 
-		err := f.adjRIBIn.AddPath(r.Prefix, path)
-		fmt.Printf("add path err: %v\n", err)
+		f.adjRIBIn.AddPath(r.Prefix, path)
 	}
 }
 
diff --git a/routingtable/adjRIBIn/adj_rib_in.go b/routingtable/adjRIBIn/adj_rib_in.go
index 279ed35a29bd51f7ec9b2b9157148191e8800b8d..631f1d197cabc926056f186e21e1b6cd5d719afd 100644
--- a/routingtable/adjRIBIn/adj_rib_in.go
+++ b/routingtable/adjRIBIn/adj_rib_in.go
@@ -72,7 +72,6 @@ func (a *AdjRIBIn) AddPath(pfx net.Prefix, p *route.Path) error {
 
 	// RFC4456 Sect. 8: Ignore route with our RouterID as OriginatorID
 	if p.BGPPath.OriginatorID == a.routerID {
-		panic("FKJK")
 		return nil
 	}
 
diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
index 02411722b3d58ed2be6fcd2e4c950da21807f8cf..ee2d86559d828f247f0631e2c3d18f3408b550ff 100644
--- a/testing/BUILD.bazel
+++ b/testing/BUILD.bazel
@@ -2,9 +2,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["conn_mock.go"],
+    srcs = [
+        "conn_mock.go",
+        "log.go",
+    ],
     importpath = "github.com/bio-routing/bio-rd/testing",
     visibility = ["//visibility:public"],
+    deps = ["//vendor/github.com/sirupsen/logrus:go_default_library"],
 )
 
 go_test(