diff --git a/lib/SNMP/Info/Layer2/3Com.pm b/lib/SNMP/Info/Layer2/3Com.pm
index 775adc57..b3824623 100644
--- a/lib/SNMP/Info/Layer2/3Com.pm
+++ b/lib/SNMP/Info/Layer2/3Com.pm
@@ -49,6 +49,7 @@ sub serial {
             return $e_serial->{$e};
         }
     }
+    return;
 }
 
 sub os_ver {
@@ -61,6 +62,7 @@ sub os_ver {
             return $e_swver->{$e};
         }
     }
+    return;
 }
 
 sub vendor {
@@ -76,6 +78,7 @@ sub model {
     } else {
         return $descr;
     }
+    return;
 }
 
 1;
diff --git a/xt/lib/Test/SNMP/Info/Layer2/3Com.pm b/xt/lib/Test/SNMP/Info/Layer2/3Com.pm
new file mode 100644
index 00000000..19614f46
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer2/3Com.pm
@@ -0,0 +1,103 @@
+# Test::SNMP::Info::Layer2::3Com
+#
+# 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::Layer2::3Com;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer2::3Com;
+
+sub setup : Tests(setup) {
+  my $test = shift;
+  $test->SUPER::setup;
+
+  # Start with a common cache that will serve most tests
+  my $cache_data = {
+    '_layers'      => 2,
+    '_description' => 'Super Stack Switch 3812 Software',
+    '_e_serial'    => 1,
+    '_e_swver'     => 1,
+    '_id'          => '.1.3.6.1.4.1.43.1.8.40',
+    'store'        => {
+      'e_serial' => {1 => '123456ABC', 2 => '234567ABC', 3 => undef},
+      'e_swver'  => {1 => undef,       2 => '3.0.3',     3 => undef},
+    }
+  };
+  $test->{info}->cache($cache_data);
+}
+
+sub os : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os');
+  is($test->{info}->os(), '3Com', q(Vendor returns '3Com'));
+}
+
+sub serial : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'serial');
+  is($test->{info}->serial(), '123456ABC', q(Serial has expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->serial(), undef, q(No serial returns undef model));
+}
+
+sub os_ver : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os_ver');
+  is($test->{info}->os_ver(), '3.0.3', q(OS version has expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->os_ver(), undef, q(No OS version returns undef model));
+}
+
+sub vendor : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'vendor');
+  is($test->{info}->vendor(), '3Com', q(Vendor returns '3Com'));
+}
+
+sub model : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'model');
+  is(
+    $test->{info}->model(),
+    'Super Stack Switch 3812',
+    q(Model is expected value)
+  );
+
+  $test->{info}->clear_cache();
+  is($test->{info}->model(), undef, q(No description returns undef model));
+}
+
+1;