diff --git a/lib/SNMP/Info/CiscoPortSecurity.pm b/lib/SNMP/Info/CiscoPortSecurity.pm
index 6a4ecc12..711e59ee 100644
--- a/lib/SNMP/Info/CiscoPortSecurity.pm
+++ b/lib/SNMP/Info/CiscoPortSecurity.pm
@@ -32,8 +32,9 @@ package SNMP::Info::CiscoPortSecurity;
 
 use strict;
 use Exporter;
+use SNMP::Info;
 
-@SNMP::Info::CiscoPortSecurity::ISA       = qw/Exporter/;
+@SNMP::Info::CiscoPortSecurity::ISA       = qw/SNMP::Info Exporter/;
 @SNMP::Info::CiscoPortSecurity::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
@@ -82,20 +83,16 @@ $VERSION = '3.54';
     # CISCO-PORT-SECURITY-MIB::cpsIfVlanTable
     'cps_i_v_mac_count' => 'cpsIfVlanCurSecureMacAddrCount',
     'cps_i_v_mac_max'   => 'cpsIfVlanMaxSecureMacAddr',
-    'cps_i_v'           => 'cpsIfVlanIndex',
 
     # CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable
     'cps_i_v_mac_status' => 'cpsIfVlanSecureMacAddrRowStatus',
     'cps_i_v_mac_age'    => 'cpsIfVlanSecureMacAddrRemainAge',
     'cps_i_v_mac_type'   => 'cpsIfVlanSecureMacAddrType',
-    'cps_i_v_vlan'       => 'cpsIfVlanSecureVlanIndex',
-    'cps_i_v_mac'        => 'cpsIfVlanSecureMacAddress',
 
     # CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable
     'cps_m_status' => 'cpsSecureMacAddrRowStatus',
     'cps_m_age'    => 'cpsSecureMacAddrRemainingAge',
     'cps_m_type'   => 'cpsSecureMacAddrType',
-    'cps_m_mac'    => 'cpsSecureMacAddress',
 
     # IEEE8021-PAE-MIB::dot1xPaePortEntry
     'pae_i_capabilities'            => 'dot1xPaePortCapabilities',
@@ -107,8 +104,6 @@ $VERSION = '3.54';
 
 %MUNGE = (
     'cps_i_mac'                     => \&SNMP::Info::munge_mac,
-    'cps_m_mac'                     => \&SNMP::Info::munge_mac,
-    'cps_i_v_mac'                   => \&SNMP::Info::munge_mac,
     'pae_i_last_eapol_frame_source' => \&SNMP::Info::munge_mac,
     'pae_i_capabilities'            => \&munge_pae_capabilities,
 );
@@ -323,10 +318,6 @@ These are methods that return scalar values from SNMP
 
 (C<cpsIfVlanMaxSecureMacAddr>)
 
-=item $cps->cps_i_v()
-
-(C<cpsIfVlanIndex>)
-
 =back
 
 =head2 C<CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable>
@@ -345,14 +336,6 @@ These are methods that return scalar values from SNMP
 
 (C<cpsIfVlanSecureMacAddrType>)
 
-=item $cps->cps_i_v_vlan()
-
-(C<cpsIfVlanSecureVlanIndex>)
-
-=item $cps->cps_i_v_mac()
-
-(C<cpsIfVlanSecureMacAddress>)
-
 =back
 
 =head2 C<CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable>
@@ -371,10 +354,6 @@ These are methods that return scalar values from SNMP
 
 (C<cpsSecureMacAddrType>)
 
-=item $cps->cps_m_mac()
-
-(C<cpsSecureMacAddress>)
-
 =back
 
 =head2 C<IEEE8021-PAE-MIB::dot1xPaePortEntry>
diff --git a/xt/lib/Test/SNMP/Info/CiscoPortSecurity.pm b/xt/lib/Test/SNMP/Info/CiscoPortSecurity.pm
new file mode 100644
index 00000000..3d317a58
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/CiscoPortSecurity.pm
@@ -0,0 +1,55 @@
+# Test::SNMP::Info::CiscoPortSecurity
+#
+# 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::CiscoPortSecurity;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::CiscoPortSecurity;
+
+# 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