diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 7483d61..196935b 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -21,6 +21,333 @@
 <!-- This version must agree with that in apps/common/res/apns.xml -->
 <apns version="8">
 
+  <apn carrier="AT&amp;T PHONE TEST SIM"
+      mcc="001"
+      mnc="01"
+      apn="phone"
+      user=""
+      password=""
+      proxy=""
+      port=""
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,supl,hipri,fota,dun"
+      mtusize="1410"
+  />
+
+  <apn carrier="T-Mobie TEST SIM"
+      mcc="001"
+      mnc="01"
+      apn="phone"
+      user=""
+      password=""
+      proxy=""
+      port=""
+      type="default,supl,hipri,dun"
+      mtusize="1440"
+  />
+
+  <apn carrier="Test 800"
+      mcc="001"
+      mnc="01"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="5"
+  />
+
+  <apn carrier="Test 800"
+      mcc="001"
+      mnc="01"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="5"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="001"
+      mnc="01"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="2"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="001"
+      mnc="01"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="2"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="001"
+      mnc="01"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="4"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="001"
+      mnc="01"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="4"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="001"
+      mnc="01"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="1"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="001"
+      mnc="01"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="1"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="001"
+      mnc="01"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="false"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      authtype="3"
+      bearer="6"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="001"
+      mnc="01"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="001"
+      mnc="01"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="3"
+      max_conns="1023"
+      max_conns_time="300"
+      wait_time="0"
+  />
+
+  <apn carrier="Test 800"
+      mcc="001"
+      mnc="010"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="5"
+  />
+
+  <apn carrier="Test 800"
+      mcc="001"
+      mnc="010"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="5"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="001"
+      mnc="010"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="2"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="001"
+      mnc="010"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="2"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="001"
+      mnc="010"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="4"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="001"
+      mnc="010"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="4"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="001"
+      mnc="010"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="1"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="001"
+      mnc="010"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="1"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="001"
+      mnc="010"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="false"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      authtype="3"
+      bearer="6"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="001"
+      mnc="010"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="001"
+      mnc="010"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="3"
+      max_conns="1023"
+      max_conns_time="300"
+      wait_time="0"
+  />
+
   <apn carrier="Cosmote Wireless Internet"
       mcc="202"
       mnc="01"
@@ -4445,6 +4772,306 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Test 800"
+      mcc="246"
+      mnc="081"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="5"
+  />
+
+  <apn carrier="Test 800"
+      mcc="246"
+      mnc="081"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="5"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="246"
+      mnc="081"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="2"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="246"
+      mnc="081"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="2"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="246"
+      mnc="081"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="4"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="246"
+      mnc="081"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="4"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="246"
+      mnc="081"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="1"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="246"
+      mnc="081"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="1"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="246"
+      mnc="081"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="false"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      authtype="3"
+      bearer="6"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="246"
+      mnc="081"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="246"
+      mnc="081"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="3"
+      max_conns="1023"
+      max_conns_time="300"
+      wait_time="0"
+  />
+
+  <apn carrier="Test 800"
+      mcc="246"
+      mnc="81"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="5"
+  />
+
+  <apn carrier="Test 800"
+      mcc="246"
+      mnc="81"
+      apn="VZW800"
+      type="vzw800"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="5"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="246"
+      mnc="81"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="2"
+  />
+
+  <apn carrier="Test FOTA"
+      mcc="246"
+      mnc="81"
+      apn="VZWADMIN"
+      type="fota"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="2"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="246"
+      mnc="81"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="4"
+  />
+
+  <apn carrier="Test CBS"
+      mcc="246"
+      mnc="81"
+      apn="VZWAPP"
+      type="cbs"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="4"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="246"
+      mnc="81"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="1"
+  />
+
+  <apn carrier="Test IMS"
+      mcc="246"
+      mnc="81"
+      apn="VZWIMS"
+      type="ims,ia"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="1"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="246"
+      mnc="81"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="false"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      authtype="3"
+      bearer="6"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="246"
+      mnc="81"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+      class="3"
+  />
+
+  <apn carrier="Test Internet"
+      mcc="246"
+      mnc="81"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,mms,dun,stdhipri"
+      inactivetimer="-1"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+      class="3"
+      max_conns="1023"
+      max_conns_time="300"
+      wait_time="0"
+  />
+
   <apn carrier="LMT Internet"
       mcc="247"
       mnc="01"
@@ -6486,6 +7113,48 @@
       bearer="14"
   />
 
+  <apn carrier=" ALU Test-SIM Internet"
+      mcc="310"
+      mnc="028"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,dun"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier=" ALU Test-SIM FOTA"
+      mcc="310"
+      mnc="028"
+      apn="VZWADMIN"
+      type="fota"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier=" ALU Test-SIM IMS"
+      mcc="310"
+      mnc="028"
+      apn="VZWIMS"
+      type="ims,ia"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier=" ALU Test-SIM CBS"
+      mcc="310"
+      mnc="028"
+      apn="VZWAPP"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="cbs,hipri,mms"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="myBlue Pix"
       mcc="310"
       mnc="030"
@@ -8664,6 +9333,98 @@
       mvno_type="imsi"
   />
 
+  <apn carrier="Ericsson Test-SIM Internet"
+      mcc="311"
+      mnc="390"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,dun"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+  />
+
+  <apn carrier="Ericsson Test-SIM Internet"
+      mcc="311"
+      mnc="390"
+      apn="VZWINTERNET"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="default,dun"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+  />
+
+  <apn carrier="Ericsson Test-SIM FOTA"
+      mcc="311"
+      mnc="390"
+      apn="VZWADMIN"
+      type="fota"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+  />
+
+  <apn carrier="Ericsson Test-SIM FOTA"
+      mcc="311"
+      mnc="390"
+      apn="VZWADMIN"
+      type="fota"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+  />
+
+  <apn carrier="Ericsson Test-SIM IMS"
+      mcc="311"
+      mnc="390"
+      apn="VZWIMS"
+      type="ims,ia"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+  />
+
+  <apn carrier="Ericsson Test-SIM IMS"
+      mcc="311"
+      mnc="390"
+      apn="VZWIMS"
+      type="ims,ia"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+  />
+
+  <apn carrier="Ericsson Test-SIM CBS"
+      mcc="311"
+      mnc="390"
+      apn="VZWAPP"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="cbs,hipri,mms"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="14"
+  />
+
+  <apn carrier="Ericsson Test-SIM CBS"
+      mcc="311"
+      mnc="390"
+      apn="VZWAPP"
+      mmsc="http://mms.vtext.com/servlets/mms"
+      type="cbs,hipri,mms"
+      carrier_enabled="true"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      bearer="13"
+  />
+
   <apn carrier="Sprint"
       mcc="311"
       mnc="490"
diff --git a/etc/test-apns-conf_verizon.xml b/etc/test-apns-conf_verizon.xml
index 409ec80..4bf5cf8 100644
--- a/etc/test-apns-conf_verizon.xml
+++ b/etc/test-apns-conf_verizon.xml
@@ -49,130 +49,6 @@
         roaming_protocol="IPV4V6"
     />
 
-    <apn carrier=" ALU Test-SIM Internet"
-        mcc="310"
-        mnc="028"
-        apn="VZWINTERNET"
-        mmsc="http://mms.vtext.com/servlets/mms"
-        type="default,dun"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-    />
-    <apn carrier=" ALU Test-SIM FOTA"
-        mcc="310"
-        mnc="028"
-        apn="VZWADMIN"
-        type="fota"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-    />
-    <apn carrier=" ALU Test-SIM IMS"
-        mcc="310"
-        mnc="028"
-        apn="VZWIMS"
-        type="ims,ia"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-    />
-    <apn carrier=" ALU Test-SIM CBS"
-        mcc="310"
-        mnc="028"
-        apn="VZWAPP"
-        mmsc="http://mms.vtext.com/servlets/mms"
-        type="cbs,hipri,mms"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-    />
-
-    <apn carrier="Ericsson Test-SIM Internet"
-        mcc="311"
-        mnc="390"
-        apn="VZWINTERNET"
-        mmsc="http://mms.vtext.com/servlets/mms"
-        type="default,dun"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="Ericsson Test-SIM Internet"
-        mcc="311"
-        mnc="390"
-        apn="VZWINTERNET"
-        mmsc="http://mms.vtext.com/servlets/mms"
-        type="default,dun"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="Ericsson Test-SIM FOTA"
-        mcc="311"
-        mnc="390"
-        apn="VZWADMIN"
-        type="fota"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="Ericsson Test-SIM FOTA"
-        mcc="311"
-        mnc="390"
-        apn="VZWADMIN"
-        type="fota"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="Ericsson Test-SIM IMS"
-        mcc="311"
-        mnc="390"
-        apn="VZWIMS"
-        type="ims,ia"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="Ericsson Test-SIM IMS"
-        mcc="311"
-        mnc="390"
-        apn="VZWIMS"
-        type="ims,ia"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="Ericsson Test-SIM CBS"
-        mcc="311"
-        mnc="390"
-        apn="VZWAPP"
-        mmsc="http://mms.vtext.com/servlets/mms"
-        type="cbs,hipri,mms"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="Ericsson Test-SIM CBS"
-        mcc="311"
-        mnc="390"
-        apn="VZWAPP"
-        mmsc="http://mms.vtext.com/servlets/mms"
-        type="cbs,hipri,mms"
-        carrier_enabled="true"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-
     <!-- Modify Apn database for VZW LTE support -->
      <apn carrier="LTE - Verizon Internet"
         mcc="311"
@@ -252,180 +128,6 @@
         roaming_protocol="IPV4V6"
         bearer="14"
     />
-    <apn carrier="LTE - Test Internet"
-        mcc="001"
-        mnc="01"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - Test FOTA"
-        mcc="001"
-        mnc="01"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - Test IMS"
-        mcc="001"
-        mnc="01"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - Test CBS"
-        mcc="001"
-        mnc="01"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="Test 800"
-        mcc="001"
-        mnc="01"
-        apn="VZW800"
-        type="vzw800"
-        bearer="14"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-    />
-    <apn carrier="LTE - VZW Test Internet"
-        mcc="001"
-        mnc="010"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test FOTA"
-        mcc="001"
-        mnc="010"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test IMS"
-        mcc="001"
-        mnc="010"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test CBS"
-        mcc="001"
-        mnc="010"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="VZW Test 800"
-        mcc="001"
-        mnc="010"
-        apn="VZW800"
-        type="vzw800"
-        bearer="14"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-    />
-    <apn carrier="LTE - VZW Test Internet"
-        mcc="246"
-        mnc="81"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test FOTA"
-        mcc="246"
-        mnc="81"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test IMS"
-        mcc="246"
-        mnc="81"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test CBS"
-        mcc="246"
-        mnc="81"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-   <apn carrier="LTE - VZW Test Internet"
-        mcc="246"
-        mnc="081"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test FOTA"
-        mcc="246"
-        mnc="081"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test IMS"
-        mcc="246"
-        mnc="081"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
-    <apn carrier="LTE - VZW Test CBS"
-        mcc="246"
-        mnc="081"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="14"
-    />
     <!-- END modify Apn database for VZW LTE support -->
     <!-- Modify Apn database for VZW EHRPD support -->
     <apn carrier="EHRPD - Verizon Internet"
@@ -506,171 +208,6 @@
         roaming_protocol="IPV4V6"
         bearer="13"
     />
-    <apn carrier="EHRPD - Test Internet"
-        mcc="001"
-        mnc="01"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - Test FOTA"
-        mcc="001"
-        mnc="01"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - Test IMS"
-        mcc="001"
-        mnc="01"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - Test CBS"
-        mcc="001"
-        mnc="01"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="Test 800"
-        mcc="001"
-        mnc="01"
-        apn="VZW800"
-        type="vzw800"
-        bearer="13"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-    />
-    <apn carrier="EHRPD - VZW Test Internet"
-        mcc="001"
-        mnc="010"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test FOTA"
-        mcc="001"
-        mnc="010"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test IMS"
-        mcc="001"
-        mnc="010"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test CBS"
-        mcc="001"
-        mnc="010"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test Internet"
-        mcc="246"
-        mnc="81"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test FOTA"
-        mcc="246"
-        mnc="81"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test IMS"
-        mcc="246"
-        mnc="81"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test CBS"
-        mcc="246"
-        mnc="81"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-   <apn carrier="EHRPD - VZW Test Internet"
-        mcc="246"
-        mnc="081"
-        apn="VZWINTERNET"
-        type="default,dun"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test FOTA"
-        mcc="246"
-        mnc="081"
-        apn="VZWADMIN"
-        type="fota"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test IMS"
-        mcc="246"
-        mnc="081"
-        apn="VZWIMS"
-        type="ims,ia"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
-    <apn carrier="EHRPD - VZW Test CBS"
-        mcc="246"
-        mnc="081"
-        apn="VZWAPP"
-        type="cbs,mms"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        protocol="IPV4V6"
-        roaming_protocol="IPV4V6"
-        bearer="13"
-    />
     <!-- END modify Apn database for VZW EHRPD support -->
 
 </apns>