diff --git a/default.xml b/default.xml
index 4b5f3df..5d9940d 100644
--- a/default.xml
+++ b/default.xml
@@ -38,6 +38,7 @@
   <project name="vendor/google/sageserver"/>
   <project name="vendor/google/swscale"/>
   <project name="vendor/google/telepresence"/>
+  <project name="vendor/google/test"/>
   <project name="vendor/google/tvstreamparser"/>
   <project name="vendor/google/mcastcapture"/>
   <project name="vendor/google/widevine"/>
diff --git a/m1.xml b/m1.xml
deleted file mode 100644
index 3485417..0000000
--- a/m1.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch="https://code.google.com/" name="cgc"/>
-  <remote fetch="ssh://wavejumper.i.corp.google.com:29418" name="wavejumper" review="http://wavejumper.i.corp.google.com/"/>
-  
-  <default remote="wavejumper" revision="master" sync-j="6"/>
-  
-  <project name="a/google.com/p/athena-cwmp/" path="vendor/google/catawampus" remote="cgc" revision="01b482f07beb11e0f07564e4549b3e7e47de7249"/>
-  <project name="buildroot" revision="b28ca920145992086333f9ee7bb9a218e820ba37"/>
-  <project name="kernel-bruno" path="kernel/bruno" revision="49a2e86f25e998dd8779c444506c6a842acf3eab"/>
-  <project name="kernel-uno" path="kernel/uno" revision="2e05acc7789275c52a27d2e835556665ac434b54"/>
-  <project name="manifest" revision="24853f7208bc257e570e89dd803f2d840d64d932"/>
-  <project name="toolbox-for-linux" revision="de9773cb73173e4ca2818fe4731994ed2442a44f"/>
-  <project name="toolchains-bruno" path="toolchains/bruno" revision="2cee82571a7c44bd621d84332b0eba86c2444057"/>
-  <project name="toolchains-uno" path="toolchains/uno" revision="d3d857acf94f8afe28eec326c012de2b7a37b0ce"/>
-  <project name="vendor-broadcom-AppLibs" path="vendor/broadcom/AppLibs" revision="4386b6c659c74ba9b98f53ef53c749da62bfcfd1"/>
-  <project name="vendor-broadcom-BSEAV" path="vendor/broadcom/BSEAV" revision="e109efd7a91d228418a7e7534661f6e26da335df"/>
-  <project name="vendor-broadcom-alsa" path="vendor/broadcom/alsa" revision="34a5cc71f8e4c5cc96e2af4598e5d07fc4f956e4"/>
-  <project name="vendor-broadcom-drivers" path="vendor/broadcom/drivers" revision="a956db59ad8d9456fcf44dd91a44dce657a6362b"/>
-  <project name="vendor-broadcom-magnum" path="vendor/broadcom/magnum" revision="109011977f041ed8da30f3ba9c1e00751e45f5ac"/>
-  <project name="vendor-broadcom-nexus" path="vendor/broadcom/nexus" revision="3df7b7e5081f5be4f4d5bf69fbd2d9b1b2144507"/>
-  <project name="vendor-broadcom-rockford" path="vendor/broadcom/rockford" revision="d170be22e05cbb01756d345fc1f0c965887573df"/>
-  <project name="vendor-google-dvbcapture" path="vendor/google/dvbcapture" revision="bef103409d67a47c66c185cf3d94c7a91457c675"/>
-  <project name="vendor-google-freetypejni" path="vendor/google/freetypejni" revision="f65913110d7d030398aa0068389426e4956cbcfb"/>
-  <project name="vendor-google-gips" path="vendor/google/gips" revision="1e05d734e8cf07bdc24ab7d790107562f36afb55"/>
-  <project name="vendor-google-imageloadjni" path="vendor/google/imageloadjni" revision="af0b7d8b0b28e0df962302833d146c0167c4f53f"/>
-  <project name="vendor-google-jtux" path="vendor/google/jtux" revision="5612d7af1e9c5f13ccf66b899354521436c00383"/>
-  <project name="vendor-google-mcastcapture" path="vendor/google/mcastcapture" revision="6c38731288e18bac8ff4fed790da817e40d80764"/>
-  <project name="vendor-google-mpegparser" path="vendor/google/mpegparser" revision="c48e42c441866dedb8332ef29d839b33fe736ece"/>
-  <project name="vendor-google-platform" path="vendor/google/platform" revision="e1c5254b64247563427f4a2810e662371a738a05"/>
-  <project name="vendor-google-sagejni" path="vendor/google/sagejni" revision="79e9f05e744c120aa0bd020130771ef1851c7267"/>
-  <project name="vendor-google-swscale" path="vendor/google/swscale" revision="5af29bb813f190ba5a0c4367ed293f9729f2f313"/>
-  <project name="vendor-google-telepresence" path="vendor/google/telepresence" revision="2069c78afc3c5e9bd45ea3a58e0369b4d2f170ac"/>
-  <project name="vendor-google-tvstreamparser" path="vendor/google/tvstreamparser" revision="4ac65537f539be1a773518536b74bd3c3797a5c6"/>
-  <project name="vendor-humax-bootloader" path="vendor/humax/bootloader" revision="f8faec0850fd41bbefb2b6721391a95691e3063c"/>
-  <project name="vendor-humax-misc" path="vendor/humax/misc" revision="56fe1a8bc62469f85a735a0d2da133df7afd2ebf"/>
-  <project name="vendor-marvell-mv_cust" path="vendor/marvell/mv_cust" revision="e3f1aee77152fdbebb68c2f412e4019a02b61f2c"/>
-  <project name="vendor-opensource-fallocate" path="vendor/opensource/fallocate" revision="d1e9152aca6e81b645fe17af904de466036a5101"/>
-  <project name="vendor-opensource-ffmpeg" path="vendor/opensource/ffmpeg" revision="bd383d082b0a728de010cecc7f62f00d13b9a5cf"/>
-  <project name="vendor-opensource-libjingle" path="vendor/opensource/libjingle" revision="37682ba709f585e2c4f879658497304657c146b5"/>
-  <project name="vendor-opensource-tarballs" path="vendor/opensource/tarballs" revision="3b3b2cc1f4208c40097ed24ced63e800ea21131b"/>
-  <project name="vendor-sagetv-miniclient" path="vendor/sagetv/miniclient" revision="b7a05292138a7a56860c3b0abd6fcd08de484a34"/>
-  <project name="vendor-sagetv-pullreader" path="vendor/sagetv/pullreader" revision="a6dff0e0b7b4c21b571f13f6c1e63815864dc2b9"/>
-</manifest>