diff --git a/lib/SNMP/Info/SONMP.pm b/lib/SNMP/Info/SONMP.pm
index 41978315..e9b0baad 100644
--- a/lib/SNMP/Info/SONMP.pm
+++ b/lib/SNMP/Info/SONMP.pm
@@ -43,7 +43,7 @@ $VERSION = '3.53';
 
 %MIBS = (
     'SYNOPTICS-ROOT-MIB'           => 'synoptics',
-    'S5-ETH-MULTISEG-TOPOLOGY-MIB' => 's5EnMsTop',
+    'S5-ETH-MULTISEG-TOPOLOGY-MIB' => 's5EnMsTopInfo',
 );
 
 %GLOBALS = (
diff --git a/xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm b/xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm
new file mode 100644
index 00000000..fda80fce
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm
@@ -0,0 +1,90 @@
+# Test::SNMP::Info::Layer1::Bayhub
+#
+# 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::Layer1::Bayhub;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer1::Bayhub;
+
+# 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' => 1,
+    '_description' =>
+      'Bay Stack 250 Dual Speed Stackable Hub SNMP/Telnet Agent v3.2.1',
+    '_id'   => '.1.3.6.1.4.1.45.3.34.1',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+sub layers : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'layers');
+  is($test->{info}->layers(), '00000011', q(Layers returns '00000011'));
+}
+
+sub os : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os');
+  is($test->{info}->os(), 'bay_hub', q(Vendor returns 'bay_hub'));
+}
+
+sub vendor : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'vendor');
+  is($test->{info}->vendor(), 'avaya', q(Vendor returns 'avaya'));
+}
+
+sub model : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'model');
+  is($test->{info}->model(), 'Baystack Hub', q(Model is expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->model(), undef, q(No id returns undef model));
+}
+
+1;
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Baystack.pm b/xt/lib/Test/SNMP/Info/Layer2/Baystack.pm
new file mode 100644
index 00000000..7b764aa8
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer2/Baystack.pm
@@ -0,0 +1,85 @@
+# Test::SNMP::Info::Layer2::Baystack
+#
+# 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::Baystack;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer2::Baystack;
+
+# 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' => 2,
+    '_description' =>
+      'Ethernet Routing Switch 4826GTS-PWR+  HW:04 FW:5.6.0.18  SW:v5.6.1.053',
+
+    # SYNOPTICS-ROOT-MIB::sreg-ERS-4826GTS-PWR-PLUS
+    '_id'   => '.1.3.6.1.4.1.45.3.78.1',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+sub os : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os');
+  is($test->{info}->os(), 'boss', q(Vendor returns 'boss'));
+}
+
+sub vendor : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'vendor');
+  is($test->{info}->vendor(), 'avaya', q(Vendor returns 'avaya'));
+}
+
+sub model : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'model');
+  is($test->{info}->model(), '4826GTS-PWR-PLUS', q(Model is expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->model(), undef, q(No id returns undef model));
+}
+
+1;