diff --git a/lib/SNMP/Info/Layer3/CheckPoint.pm b/lib/SNMP/Info/Layer3/CheckPoint.pm
index 0797016a..0d187e6e 100644
--- a/lib/SNMP/Info/Layer3/CheckPoint.pm
+++ b/lib/SNMP/Info/Layer3/CheckPoint.pm
@@ -47,7 +47,7 @@ $VERSION = '3.54';
     %SNMP::Info::LLDP::MIBS,
     'CHECKPOINT-MIB'      => 'fwProduct',
     'UCD-SNMP-MIB'        => 'versionTag',
-    'NET-SNMP-TC'         => 'netSnmpAgentOIDs',
+    'NET-SNMP-TC'         => 'netSnmpAliasDomain',
     'NET-SNMP-EXTEND-MIB' => 'nsExtendNumEntries',
     'HOST-RESOURCES-MIB'  => 'hrSystem',
 );
diff --git a/lib/SNMP/Info/Layer3/NetSNMP.pm b/lib/SNMP/Info/Layer3/NetSNMP.pm
index 1b31d4ee..42e66e1d 100644
--- a/lib/SNMP/Info/Layer3/NetSNMP.pm
+++ b/lib/SNMP/Info/Layer3/NetSNMP.pm
@@ -46,7 +46,7 @@ $VERSION = '3.54';
     %SNMP::Info::Layer3::MIBS,
     %SNMP::Info::LLDP::MIBS,
     'UCD-SNMP-MIB'       => 'versionTag',
-    'NET-SNMP-TC'        => 'netSnmpAgentOIDs',
+    'NET-SNMP-TC'        => 'netSnmpAliasDomain',
     'HOST-RESOURCES-MIB' => 'hrSystem',
 );
 
diff --git a/lib/SNMP/Info/Layer3/PacketFront.pm b/lib/SNMP/Info/Layer3/PacketFront.pm
index 46f16e2a..564549b5 100644
--- a/lib/SNMP/Info/Layer3/PacketFront.pm
+++ b/lib/SNMP/Info/Layer3/PacketFront.pm
@@ -44,7 +44,7 @@ $VERSION = '3.54';
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
     'UCD-SNMP-MIB'             => 'versionTag',
-    'NET-SNMP-TC'              => 'netSnmpAgentOIDs',
+    'NET-SNMP-TC'              => 'netSnmpAliasDomain',
     'HOST-RESOURCES-MIB'       => 'hrSystem',
     'PACKETFRONT-PRODUCTS-MIB' => 'drg100',
     'PACKETFRONT-DRG-MIB'      => 'productName',
diff --git a/xt/lib/Test/SNMP/Info/Layer3/CheckPoint.pm b/xt/lib/Test/SNMP/Info/Layer3/CheckPoint.pm
new file mode 100644
index 00000000..53e7e898
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer3/CheckPoint.pm
@@ -0,0 +1,91 @@
+# Test::SNMP::Info::Layer3::CheckPoint
+#
+# Copyright (c) 2018 Eric Miller
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package Test::SNMP::Info::Layer3::CheckPoint;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer3::CheckPoint;
+
+# Remove this startup override once we have full method coverage
+sub startup : Tests(startup => 1) {
+  my $test = shift;
+  $test->SUPER::startup();
+
+  $test->todo_methods(1);
+}
+
+sub setup : Tests(setup) {
+  my $test = shift;
+  $test->SUPER::setup;
+
+  # Start with a common cache that will serve most tests
+  my $cache_data = {
+    '_layers' => 76,
+    '_description' => 'i386 FreeBSD 2.1.5. Check Point FireWall-1 Version',
+
+    # CHECKPOINT-MIB::fw
+    '_id'   => '.1.3.6.1.4.1.2620.1.1',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+sub os : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os');
+  is($test->{info}->os(), 'checkpoint', q(OS returns 'checkpoint'));
+}
+
+sub vendor : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'vendor');
+  is($test->{info}->vendor(), 'checkpoint', q(Vendor returns 'checkpoint'));
+}
+
+sub model : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'model');
+  is($test->{info}->model(), 'fw', q(Model is expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->model(), undef, q(No description returns undef model));
+}
+
+sub layers : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'layers');
+  is($test->{info}->layers(), '01001100', q(Layers returns '01001100'));
+}
+
+1;
diff --git a/xt/lib/Test/SNMP/Info/Layer3/NetSNMP.pm b/xt/lib/Test/SNMP/Info/Layer3/NetSNMP.pm
new file mode 100644
index 00000000..897d58db
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer3/NetSNMP.pm
@@ -0,0 +1,62 @@
+# Test::SNMP::Info::Layer3::NetSNMP
+#
+# Copyright (c) 2018 Eric Miller
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package Test::SNMP::Info::Layer3::NetSNMP;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer3::NetSNMP;
+
+# Remove this startup override once we have full method coverage
+sub startup : Tests(startup => 1) {
+  my $test = shift;
+  $test->SUPER::startup();
+
+  $test->todo_methods(1);
+}
+
+sub setup : Tests(setup) {
+  my $test = shift;
+  $test->SUPER::setup;
+
+  # Start with a common cache that will serve most tests
+  my $d_string = 'Linux myname 3.2.0-48-generic #74-Ubuntu SMP ';
+  $d_string .= 'Thu Jun 6 19:43:26 UTC 2013 x86_64';
+  my $cache_data = {
+    '_layers' => 72,
+    '_description' => $d_string,
+
+    # No MIB to resolve, this is net-snmp enterprise ID
+    '_id'   => '.1.3.6.1.4.1.8072',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+1;
diff --git a/xt/lib/Test/SNMP/Info/Layer3/PacketFront.pm b/xt/lib/Test/SNMP/Info/Layer3/PacketFront.pm
new file mode 100644
index 00000000..6e5e75d4
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer3/PacketFront.pm
@@ -0,0 +1,62 @@
+# Test::SNMP::Info::Layer3::PacketFront
+#
+# Copyright (c) 2018 Eric Miller
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package Test::SNMP::Info::Layer3::PacketFront;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer3::PacketFront;
+
+# Remove this startup override once we have full method coverage
+sub startup : Tests(startup => 1) {
+  my $test = shift;
+  $test->SUPER::startup();
+
+  $test->todo_methods(1);
+}
+
+sub setup : Tests(setup) {
+  my $test = shift;
+  $test->SUPER::setup;
+
+  # Start with a common cache that will serve most tests
+  my $cache_data = {
+    '_layers' => 4,
+
+    # No snmpwalk, so this is a made up sysDescr
+    '_description' => 'DRG700 Version: drgos-gui-1.14.2 ',
+
+    # PACKETFRONT-PRODUCTS-MIB::drg716
+    '_id'   => '.1.3.6.1.4.1.9303.1.3.15',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+1;