diff --git a/Makefile b/Makefile
index 333668d2c..45ae42709 100644
--- a/Makefile
+++ b/Makefile
@@ -136,6 +136,9 @@ bin/bird6:
 bin/etcdctl:
 	curl -sSf -L --retry 5  https://github.com/coreos/etcd/releases/download/$(ETCD_VER)/etcd-$(ETCD_VER)-linux-$(ARCH).tar.gz | tar -xz -C bin --strip-components=1 etcd-$(ETCD_VER)-linux-$(ARCH)/etcdctl 
 
+container:
+	@echo success!
+
 .PHONY: clean
 clean:
 	rm -rf bin/*
diff --git a/glide.lock b/glide.lock
index da7b9f643..0c7f86e99 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 7556add4892b51bc84f466ccbbe74e38524b37f973c5fc62b5327f40e7323589
-updated: 2017-11-23T17:44:23.604945232Z
+hash: 8a3bf737e4d823611c42d4f66326af8c61b919359b70d0aea8e47fee2a0c8df9
+updated: 2017-11-27T15:26:54.279983188-08:00
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -60,7 +60,7 @@ imports:
   - httputil
   - timeutil
 - name: github.com/davecgh/go-spew
-  version: 782f4967f2dc4564575ca782fe2d04090b5faca8
+  version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
   subpackages:
   - spew
 - name: github.com/docker/distribution
@@ -91,9 +91,9 @@ imports:
 - name: github.com/go-openapi/jsonreference
   version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272
 - name: github.com/go-openapi/spec
-  version: 7abd5745472fff5eb3685386d5fb8bf38683154d
+  version: 6aced65f8501fe1217321abf0749d354824ba2ff
 - name: github.com/go-openapi/swag
-  version: f3f9494671f93fcff853e3c6e9e948b3eb71e590
+  version: 1d0bd113de87027671077d3c71eb3ac5d7dbba72
 - name: github.com/gogo/protobuf
   version: e18d7aa8f8c624c915db340349aad4c49b10d173
   subpackages:
@@ -152,7 +152,7 @@ imports:
 - name: github.com/kelseyhightower/memkv
   version: 71620c547230ad53777a00e2ebd3bbab8353370e
 - name: github.com/mailru/easyjson
-  version: 2f5df55504ebc322e4d52d34df6a1f5b503bf26d
+  version: d5b7844b561a7bc640052f1b935f7b800330d7e0
   subpackages:
   - buffer
   - jlexer
@@ -160,7 +160,7 @@ imports:
 - name: github.com/mitchellh/mapstructure
   version: d2dd0262208475919e1a362f675cfc0e7c10e905
 - name: github.com/projectcalico/libcalico-go
-  version: 119c3c82c1c22337ceaffea0cdca5b127a139a1d
+  version: aab828ef9fd5405040c36368f866e5ec9ea314a6
   subpackages:
   - lib/api
   - lib/api/unversioned
@@ -330,10 +330,7 @@ imports:
   - kubernetes/typed/storage/v1
   - kubernetes/typed/storage/v1beta1
   - pkg/api
-  - pkg/api/errors
   - pkg/api/install
-  - pkg/api/meta
-  - pkg/api/unversioned
   - pkg/api/v1
   - pkg/apis/apps
   - pkg/apis/apps/install
@@ -374,15 +371,9 @@ imports:
   - pkg/apis/storage/install
   - pkg/apis/storage/v1
   - pkg/apis/storage/v1beta1
-  - pkg/fields
-  - pkg/runtime
-  - pkg/runtime/schema
-  - pkg/runtime/serializer
   - pkg/util
   - pkg/util/parsers
-  - pkg/util/wait
   - pkg/version
-  - pkg/watch
   - plugin/pkg/client/auth
   - plugin/pkg/client/auth/gcp
   - plugin/pkg/client/auth/oidc
@@ -403,8 +394,4 @@ imports:
   - util/homedir
   - util/integer
   - util/jsonpath
-- name: k8s.io/kube-openapi
-  version: 61b46af70dfed79c6d24530cd23b41440a7f22a5
-  subpackages:
-  - pkg/common
 testImports: []
diff --git a/glide.yaml b/glide.yaml
index 99aa8fcfe..e2ffdb2eb 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -130,7 +130,7 @@ import:
 - package: gopkg.in/yaml.v2
   version: f7716cbe52baa25d2e9b0d0da546fcf909fc16b4
 - package: github.com/projectcalico/libcalico-go
-  version: v1.7.2
+  version: v1.7.3
   subpackages:
   - lib/backend/k8s
   - lib/backend/k8s/resources
diff --git a/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg b/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg
index b9b080afe..1e3a961d4 100644
--- a/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg
+++ b/tests/compiled_templates/mesh/ipip-cross-subnet/bird_ipam.cfg
@@ -15,7 +15,7 @@ filter calico_ipip {
 
   if ( net ~ 192.168.0.0/16 ) then {
 
-    if ( bgp_next_hop ~ 10.192.0.0/16 ) then
+    if defined(bgp_next_hop) && ( bgp_next_hop ~ 10.192.0.0/16 ) then
       krt_tunnel = "";                     
     else
       krt_tunnel = "tunl0";       
diff --git a/tests/test_suite_kdd.sh b/tests/test_suite_kdd.sh
index ef03d1688..9d07d5344 100755
--- a/tests/test_suite_kdd.sh
+++ b/tests/test_suite_kdd.sh
@@ -16,7 +16,7 @@ for test in "${TESTS_TO_RUN[@]}"; do
     if ! . ${script_dir}/test_kdd.sh ${test}; then
         success=1
     fi
-    clean_kdd
+    clean_kdd ${test}
 done
 
-exit ${success}
\ No newline at end of file
+exit ${success}
diff --git a/tests/utils.sh b/tests/utils.sh
index 5216ab17d..cba07e0b4 100755
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -63,9 +63,9 @@ populate_kdd() {
 clean_kdd() {
     echo "Cleaning out k8s API"
     to_remove=$1
-    kubectl delete -f /tests/mock_data/kdd/${to_test}/crd_data.yaml > /dev/null 2>&1
-    kubectl delete -f /tests/mock_data/kdd/${to_test}/crds.yaml > /dev/null 2>&1
-    kubectl delete -f /tests/mock_data/kdd/${to_test}/nodes.yaml > /dev/null 2>&1
+    kubectl delete -f /tests/mock_data/kdd/${to_remove}/crd_data.yaml > /dev/null 2>&1
+    kubectl delete -f /tests/mock_data/kdd/${to_remove}/crds.yaml > /dev/null 2>&1
+    kubectl delete -f /tests/mock_data/kdd/${to_remove}/nodes.yaml > /dev/null 2>&1
 }
 
 # get_templates attempts to grab the latest templates from the calico repo