diff --git a/lib/SNMP/Info/CiscoStats.pm b/lib/SNMP/Info/CiscoStats.pm
index 152244cd..55806bef 100644
--- a/lib/SNMP/Info/CiscoStats.pm
+++ b/lib/SNMP/Info/CiscoStats.pm
@@ -49,7 +49,7 @@ $VERSION = '3.54';
     'CISCO-PROCESS-MIB'     => 'cpmCPUTotal5sec',
     'CISCO-MEMORY-POOL-MIB' => 'ciscoMemoryPoolUsed',
     'OLD-CISCO-SYSTEM-MIB'  => 'writeMem',
-    'CISCO-PRODUCTS-MIB'    => 'sysName',
+    'CISCO-PRODUCTS-MIB'    => 'ciscoIGS',
     'ENTITY-MIB'            => 'entPhysicalSoftwareRev',
     'CISCO-IMAGE-MIB'       => 'ciscoImageString',
 
diff --git a/lib/SNMP/Info/Layer3/Arista.pm b/lib/SNMP/Info/Layer3/Arista.pm
index 8b51329c..9ae17b5b 100644
--- a/lib/SNMP/Info/Layer3/Arista.pm
+++ b/lib/SNMP/Info/Layer3/Arista.pm
@@ -55,7 +55,7 @@ $VERSION = '3.54';
     %SNMP::Info::MAU::MIBS,
     %SNMP::Info::LLDP::MIBS,
     %SNMP::Info::Aggregate::MIBS,
-    'ARISTA-PRODUCTS-MIB' => 'aristaProducts',
+    'ARISTA-PRODUCTS-MIB' => 'aristaDCS7124S',
 );
 
 %GLOBALS = (
diff --git a/xt/lib/Test/SNMP/Info/CiscoStats.pm b/xt/lib/Test/SNMP/Info/CiscoStats.pm
new file mode 100644
index 00000000..d4add61c
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/CiscoStats.pm
@@ -0,0 +1,55 @@
+# Test::SNMP::Info::CiscoStats
+#
+# 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::CiscoStats;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::CiscoStats;
+
+# 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 = {
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+1;
\ No newline at end of file
diff --git a/xt/lib/Test/SNMP/Info/Layer3/Arista.pm b/xt/lib/Test/SNMP/Info/Layer3/Arista.pm
new file mode 100644
index 00000000..cf44ddfd
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer3/Arista.pm
@@ -0,0 +1,94 @@
+# Test::SNMP::Info::Layer3::Arista
+#
+# 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::Arista;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer3::Arista;
+
+# 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 = 'Arista Networks EOS version 4.10.4 ';
+  $d_string .= 'running on an Arista Networks DCS-7048T-A';
+  my $cache_data = {
+    '_layers' => 4,
+    '_description' => $d_string,
+
+    # ARISTA-PRODUCTS-MIB::aristaDCS7048TA
+    '_id'   => '.1.3.6.1.4.1.30065.1.3011.7048.427.3648',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+sub os : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os');
+  is($test->{info}->os(), 'EOS', q(Vendor returns 'EOS'));
+}
+
+sub vendor : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'vendor');
+  is($test->{info}->vendor(), 'arista', q(Vendor returns 'arista'));
+}
+
+sub model : Tests(2) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'model');
+  is($test->{info}->model(), 'DCS7048TA', q(Model is expected value));
+}
+
+sub os_ver : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'os_ver');
+  is($test->{info}->os_ver(), '4.10.4', q(OS version is expected value));
+
+  $test->{info}->clear_cache();
+  is($test->{info}->os_ver(), undef,
+    q(No description returns undef OS version));
+}
+
+1;