diff --git a/xt/lib/Test/SNMP/Info/Layer1/Allied.pm b/xt/lib/Test/SNMP/Info/Layer1/Allied.pm
index 7b82cde0..4c308635 100644
--- a/xt/lib/Test/SNMP/Info/Layer1/Allied.pm
+++ b/xt/lib/Test/SNMP/Info/Layer1/Allied.pm
@@ -73,7 +73,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'allied', q(Vendor returns 'allied'));
+  is($test->{info}->os(), 'allied', q(OS returns 'allied'));
 }
 
 sub os_ver : Tests(3) {
diff --git a/xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm b/xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm
index fda80fce..377b67ee 100644
--- a/xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm
+++ b/xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm
@@ -67,7 +67,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'bay_hub', q(Vendor returns 'bay_hub'));
+  is($test->{info}->os(), 'bay_hub', q(OS returns 'bay_hub'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer1/Cyclades.pm b/xt/lib/Test/SNMP/Info/Layer1/Cyclades.pm
index 69d0b98f..39377e2e 100644
--- a/xt/lib/Test/SNMP/Info/Layer1/Cyclades.pm
+++ b/xt/lib/Test/SNMP/Info/Layer1/Cyclades.pm
@@ -139,7 +139,7 @@ sub os : Tests(2) {
     my $test = shift;
 
     can_ok( $test->{info}, 'os' );
-    is( $test->{info}->os(), 'avocent', q(Vendor returns 'avocent') );
+    is( $test->{info}->os(), 'avocent', q(OS returns 'avocent') );
 }
 
 sub os_ver : Tests(6) {
diff --git a/xt/lib/Test/SNMP/Info/Layer1/S3000.pm b/xt/lib/Test/SNMP/Info/Layer1/S3000.pm
index 5489fb8a..8624a6df 100644
--- a/xt/lib/Test/SNMP/Info/Layer1/S3000.pm
+++ b/xt/lib/Test/SNMP/Info/Layer1/S3000.pm
@@ -66,7 +66,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'synoptics', q(Vendor returns 'synoptics'));
+  is($test->{info}->os(), 'synoptics', q(OS returns 'synoptics'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/3Com.pm b/xt/lib/Test/SNMP/Info/Layer2/3Com.pm
index 19614f46..57f5d125 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/3Com.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/3Com.pm
@@ -56,7 +56,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), '3Com', q(Vendor returns '3Com'));
+  is($test->{info}->os(), '3Com', q(OS returns '3Com'));
 }
 
 sub serial : Tests(3) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Airespace.pm b/xt/lib/Test/SNMP/Info/Layer2/Airespace.pm
index a449a545..793fe915 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/Airespace.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/Airespace.pm
@@ -61,7 +61,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'cisco', q(Vendor returns 'cisco'));
+  is($test->{info}->os(), 'cisco', q(OS returns 'cisco'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Allied.pm b/xt/lib/Test/SNMP/Info/Layer2/Allied.pm
index e72da1b0..2fc2a148 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/Allied.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/Allied.pm
@@ -63,7 +63,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'allied', q(Vendor returns 'allied'));
+  is($test->{info}->os(), 'allied', q(OS returns 'allied'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Baystack.pm b/xt/lib/Test/SNMP/Info/Layer2/Baystack.pm
index 7b764aa8..c159c034 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/Baystack.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/Baystack.pm
@@ -62,7 +62,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'boss', q(Vendor returns 'boss'));
+  is($test->{info}->os(), 'boss', q(OS returns 'boss'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/C1900.pm b/xt/lib/Test/SNMP/Info/Layer2/C1900.pm
index 6d3667db..706400ae 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/C1900.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/C1900.pm
@@ -113,7 +113,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'catalyst', q(Vendor returns 'catalyst'));
+  is($test->{info}->os(), 'catalyst', q(OS returns 'catalyst'));
 }
 
 sub os_ver : Tests(3) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/C2900.pm b/xt/lib/Test/SNMP/Info/Layer2/C2900.pm
index 3cba795b..2af71b56 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/C2900.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/C2900.pm
@@ -130,7 +130,7 @@ sub i_speed_admin : Tests(3) {
   my $expected = {2 => 'auto', 3 => 'auto', 26 => '100 Mbps'};
 
   cmp_deeply($test->{info}->i_speed_admin(),
-    $expected, q(Interfaces have expected duplex admin values));
+    $expected, q(Interfaces have expected speed admin values));
 
   $test->{info}->clear_cache();
   cmp_deeply($test->{info}->i_speed_admin(),
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Catalyst.pm b/xt/lib/Test/SNMP/Info/Layer2/Catalyst.pm
index aa513a39..82bcf35e 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/Catalyst.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/Catalyst.pm
@@ -88,7 +88,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'catalyst', q(Vendor returns 'catalyst'));
+  is($test->{info}->os(), 'catalyst', q(OS returns 'catalyst'));
 }
 
 sub os_ver : Tests(3) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Centillion.pm b/xt/lib/Test/SNMP/Info/Layer2/Centillion.pm
index 0c1f4655..401f6d28 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/Centillion.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/Centillion.pm
@@ -61,7 +61,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'centillion', q(Vendor returns 'centillion'));
+  is($test->{info}->os(), 'centillion', q(OS returns 'centillion'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/CiscoSB.pm b/xt/lib/Test/SNMP/Info/Layer2/CiscoSB.pm
index e459c107..7287281c 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/CiscoSB.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/CiscoSB.pm
@@ -60,7 +60,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'ros', q(Vendor returns 'ros'));
+  is($test->{info}->os(), 'ros', q(OS returns 'ros'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/HP.pm b/xt/lib/Test/SNMP/Info/Layer2/HP.pm
index ecb387bb..ebb61f49 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/HP.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/HP.pm
@@ -60,7 +60,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'hp', q(Vendor returns 'hp'));
+  is($test->{info}->os(), 'hp', q(OS returns 'hp'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/HP4000.pm b/xt/lib/Test/SNMP/Info/Layer2/HP4000.pm
index da6a84c1..135ab1e6 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/HP4000.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/HP4000.pm
@@ -61,7 +61,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'hp', q(Vendor returns 'hp'));
+  is($test->{info}->os(), 'hp', q(OS returns 'hp'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/HPVC.pm b/xt/lib/Test/SNMP/Info/Layer2/HPVC.pm
index 9d06f3ee..c3d2016e 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/HPVC.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/HPVC.pm
@@ -54,7 +54,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'hpvc', q(Vendor returns 'hpvc'));
+  is($test->{info}->os(), 'hpvc', q(OS returns 'hpvc'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer2/Kentrox.pm b/xt/lib/Test/SNMP/Info/Layer2/Kentrox.pm
index 38c21303..36f084d4 100644
--- a/xt/lib/Test/SNMP/Info/Layer2/Kentrox.pm
+++ b/xt/lib/Test/SNMP/Info/Layer2/Kentrox.pm
@@ -52,7 +52,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'Kentrox', q(Vendor returns 'Kentrox'));
+  is($test->{info}->os(), 'Kentrox', q(OS returns 'Kentrox'));
 }
 
 sub os_ver : Tests(3) {
diff --git a/xt/lib/Test/SNMP/Info/Layer3/Aironet.pm b/xt/lib/Test/SNMP/Info/Layer3/Aironet.pm
index aff5c1dc..45e82df3 100644
--- a/xt/lib/Test/SNMP/Info/Layer3/Aironet.pm
+++ b/xt/lib/Test/SNMP/Info/Layer3/Aironet.pm
@@ -61,7 +61,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'aironet', q(Vendor returns 'aironet'));
+  is($test->{info}->os(), 'aironet', q(OS returns 'aironet'));
 }
 
 sub vendor : Tests(2) {
diff --git a/xt/lib/Test/SNMP/Info/Layer3/Arista.pm b/xt/lib/Test/SNMP/Info/Layer3/Arista.pm
index cf44ddfd..132fb3ab 100644
--- a/xt/lib/Test/SNMP/Info/Layer3/Arista.pm
+++ b/xt/lib/Test/SNMP/Info/Layer3/Arista.pm
@@ -63,7 +63,7 @@ sub os : Tests(2) {
   my $test = shift;
 
   can_ok($test->{info}, 'os');
-  is($test->{info}->os(), 'EOS', q(Vendor returns 'EOS'));
+  is($test->{info}->os(), 'EOS', q(OS returns 'EOS'));
 }
 
 sub vendor : Tests(2) {