diff --git a/doc/Developing/os/Test-Units.md b/doc/Developing/os/Test-Units.md
index 69927f3f2f..f9adc17831 100644
--- a/doc/Developing/os/Test-Units.md
+++ b/doc/Developing/os/Test-Units.md
@@ -2,28 +2,15 @@ source: Developing/os/Test-Units.md
 
 We have a testing unit for new OS', please ensure you add a test for any new OS' or updates to existing OS discovery.
 
-The OS test unit file is located `tests/OSDiscoveryTest.php`. An example of this is as follows:
-
-```php
-    public function testPulse()
-    {
-        $this->checkOS('pulse');
-        $this->checkOS('pulse', 'pulse-mag2600');
-        $this->checkOS('pulse', 'pulse-sa2500');
-        $this->checkOS('pulse', 'pulse-sa6500');
-        $this->checkOS('pulse', 'pulse-vaspe');
-        $this->checkOS('pulse', 'pulse-sa');
-    }
-```
-
-The above example has multiple test files, the first argument in the function call is the os name we expect the test 
-to pass as, the second argument is the filename to use for the test. If not filename is passed then the os name is used 
-for the file.
+All that you need to do is create an snmprec file in tests/snmpsim with the proper name. If adding the first test for
+this os, simply use the os name `pulse.snmprec` for example.  If you need to add multiple test files, you can add an
+underscore after the os name followed by a description, typically a model name.  For example: `pulse_mag2600.snmprec`.
+You can copy `skel.snmprec` to your intended name and fill in the data to make things a little easier.
 
 We utilise [snmpsim](http://snmpsim.sourceforge.net/) to do unit testing for OS discovery. For this to work you need
 to supply an snmprec file. This is pretty simple and using pulse as the example again this would look like:
 
-`tests/snmpsim/pulse-mag2600.snmprec`
+`tests/snmpsim/pulse_mag2600.snmprec`
 ```
 1.3.6.1.2.1.1.1.0|4|Pulse Secure,LLC,MAG-2600,8.0R14 (build 41869)
 1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12532.254.1.1
@@ -46,7 +33,6 @@ Common OIDs used in discovery:
 | SNMPv2-MIB::sysObjectID.0           | 1.3.6.1.2.1.1.2.0           |
 | ENTITY-MIB::entPhysicalDescr.1      | 1.3.6.1.2.1.47.1.1.1.1.2.1  |
 | ENTITY-MIB::entPhysicalMfgName.1    | 1.3.6.1.2.1.47.1.1.1.1.12.1 |
-| SML-MIB::product-Name.0             | 1.3.6.1.4.1.2.6.182.3.3.1.0 |
 
 List of SNMP data types:
 
diff --git a/includes/common.php b/includes/common.php
index 93806ffdc0..0d7c3d4356 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -1584,7 +1584,12 @@ function load_all_os($restricted = array())
         $list = $restricted;
     } else {
         $list = glob($config['install_dir'].'/includes/definitions/*.yaml');
+        if (count($list) == count($config['os'])) {
+            // already fully loaded
+            return;
+        }
     }
+
     foreach ($list as $file) {
         $tmp = Symfony\Component\Yaml\Yaml::parse(
             file_get_contents($file)
diff --git a/includes/functions.php b/includes/functions.php
index c1c8ebe107..d902676e48 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -100,9 +100,14 @@ function getHostOS($device)
     // check yaml files
     $pattern = $config['install_dir'] . '/includes/definitions/*.yaml';
     foreach (glob($pattern) as $file) {
-        $tmp = Symfony\Component\Yaml\Yaml::parse(
-            file_get_contents($file)
-        );
+        $os = basename($file, '.yaml');
+        if (isset($config['os'][$os])) {
+            $tmp = $config['os'][$os];
+        } else {
+            $tmp = Symfony\Component\Yaml\Yaml::parse(
+                file_get_contents($file)
+            );
+        }
         if (isset($tmp['discovery']) && is_array($tmp['discovery'])) {
             foreach ($tmp['discovery'] as $item) {
                 // check each item individually, if all the conditions in that item are true, we have a match
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index c33531c23b..6526bf7b86 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * DiscoveryTest.php
+ * OSDiscoveryTest.php
  *
- * -Description-
+ * Test all discovery for all OS
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,8 +25,73 @@
 
 namespace LibreNMS\Tests;
 
-class DiscoveryTest extends \PHPUnit_Framework_TestCase
+use PHPUnit_Framework_ExpectationFailedException as PHPUnitException;
+
+class OSDiscoveryTest extends \PHPUnit_Framework_TestCase
 {
+    private static $unchecked_files;
+
+    /**
+     * Populate a list of files to check and make sure it isn't empty
+     */
+    public function testHaveFilesToTest()
+    {
+        global $config;
+
+        $glob = $config['install_dir'] . "/tests/snmpsim/*.snmprec";
+
+        self::$unchecked_files = array_flip(array_map(function ($file) {
+            return basename($file, '.snmprec');
+        }, glob($glob)));
+
+        $this->assertNotEmpty(self::$unchecked_files);
+    }
+
+    /**
+     * Test each OS provided by osProvider
+     *
+     * @depends      testHaveFilesToTest
+     * @dataProvider osProvider
+     * @param $os_name
+     */
+    public function testOS($os_name)
+    {
+        global $config;
+
+        $this->assertNotEmpty(
+            self::$unchecked_files,
+            'Something wrong with the tests, $unchecked_files should be populated'
+        );
+
+        $glob = $config['install_dir'] . "/tests/snmpsim/$os_name*.snmprec";
+        $files = array_map(function ($file) {
+            return basename($file, '.snmprec');
+        }, glob($glob));
+        $files = array_filter($files, function ($file) use ($os_name) {
+            return $file == $os_name || starts_with($file, $os_name . '_');
+        });
+
+        if (empty($files)) {
+            throw new PHPUnitException("No snmprec files found for $os_name!");
+        }
+
+        foreach ($files as $file) {
+            $this->checkOS($os_name, $file);
+            unset(self::$unchecked_files[$file]);  // This file has been tested
+        }
+    }
+
+    /**
+     * Test that all files have been tested (removed from self::$unchecked_files
+     * Except skel.snmprec, the example file.
+     *
+     * @depends testOS
+     */
+    public function testAllFilesTested()
+    {
+        $this->assertEquals(array('skel'), array_keys(self::$unchecked_files));
+    }
+
     /**
      * Set up and test an os
      * If $filename is not set, it will use the snmprec file matching $expected_os
@@ -69,1874 +134,27 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    public function testOSTestsExist()
+    /**
+     * Provides a list of OS to generate tests.
+     *
+     * @return array
+     */
+    public function osProvider()
     {
         global $config;
-        load_all_os();
+
+        load_all_os(); // make sure all OS are loaded
 
         $excluded_os = array(
             'default',
             'generic',
         );
-
         $all_os = array_diff(array_keys($config['os']), $excluded_os);
 
-        foreach ($all_os as $os) {
-            $function = 'test'.str_replace(' ', '', ucwords(str_replace(array('-', '_'), ' ', $os)));
-            $this->assertTrue(method_exists($this, $function), "Missing discovery tests for $os");
-        }
-    }
+        array_walk($all_os, function (&$os) {
+            $os = array($os);
+        });
 
-    public function testFileTestsExist()
-    {
-        global $config;
-        $files = glob($config['install_dir'] . "/tests/snmpsim/*.snmprec");
-        preg_match_all(
-            '/checkOS\([\'"]([^\'")]+)[\'"][, \'"]*([^\'")]*)[\'"]*\)/',
-            file_get_contents(__FILE__),
-            $tests
-        );
-
-        foreach ($files as $file) {
-            $test_name = basename($file, '.snmprec');
-
-            $index = array_search($test_name, $tests[1]);
-
-            if ($test_name != 'skel' && $index === false) {
-                $next = array_search($test_name, $tests[2]);
-                if ($next === false) {
-                    $this->fail("No test for $file");
-                }
-            }
-        }
-    }
-
-    public function test3com()
-    {
-        $this->checkOS('3com');
-        $this->checkOS('3com', '3com1');
-        $this->checkOS('3com', '3com2');
-    }
-
-    public function testAcano()
-    {
-        $this->checkOS('acano');
-    }
-
-    public function testAcs()
-    {
-        $this->checkOS('acs');
-    }
-
-    public function testAcsw()
-    {
-        $this->checkOS('acsw');
-        $this->checkOS('acsw', 'acsw1');
-        $this->checkOS('acsw', 'acsw2');
-    }
-
-    public function testAdtranAos()
-    {
-        $this->checkOS('adtran-aos');
-        $this->checkOS('adtran-aos', 'adtran-aos1');
-    }
-
-    public function testAen()
-    {
-        $this->checkOS('aen');
-        $this->checkOS('aen', 'aen1');
-        $this->checkOS('aen', 'aen2');
-    }
-
-    public function testAerohive()
-    {
-        $this->checkOS('aerohive');
-    }
-
-    public function testAirport()
-    {
-        $this->checkOS('airport');
-        $this->checkOS('airport', 'airport1');
-        $this->checkOS('airport', 'airport2');
-    }
-
-    public function testAiros()
-    {
-        $this->checkOS('airos');
-        $this->checkOS('airos', 'airos1');
-        $this->checkOS('airos', 'airos2');
-    }
-
-    public function testAirosAf()
-    {
-        $this->checkOS('airos-af');
-    }
-
-    public function testAkcp()
-    {
-        $this->checkOS('akcp');
-        $this->checkOS('akcp', 'akcp1');
-        $this->checkOS('akcp', 'akcp-securityprobe');
-    }
-
-    public function testAos()
-    {
-        $this->checkOS('aos');
-        $this->checkOS('aos', 'aos1');
-        $this->checkOS('aos', 'aos-omnistack');
-    }
-
-    public function testAosEmu2()
-    {
-        $this->checkOS('aos-emu2');
-    }
-
-    public function testAllied()
-    {
-        $this->checkOS('allied');
-    }
-
-    public function testApc()
-    {
-        $this->checkOS('apc');
-        $this->checkOS('apc', 'apc-switched-rack');
-        $this->checkOS('apc', 'apc-masterswitch');
-        $this->checkOS('apc', 'apc-metered-rack');
-        $this->checkOS('apc', 'apc-embedded-powernet');
-    }
-
-    public function testApcMgeups()
-    {
-        $this->checkOS('apc-mgeups');
-        $this->checkOS('apc-mgeups', 'mgeups-galaxy');
-    }
-
-    public function testApic()
-    {
-        $this->checkOS('apic');
-    }
-
-    public function testApplicationsWare()
-    {
-        $this->checkOS('applicationsware');
-    }
-
-    public function testArdmoreencoder()
-    {
-        $this->checkOS('ardmore-encoder');
-    }
-
-    public function testAreca()
-    {
-        $this->checkOS('areca');
-        $this->checkOS('areca', 'areca1');
-    }
-
-    public function testAristaEos()
-    {
-        $this->checkOS('arista_eos');
-    }
-
-    public function testArrayOS()
-    {
-        $this->checkOS('arrayos');
-    }
-
-    public function testArubaos()
-    {
-        $this->checkOS('arubaos');
-        $this->checkOS('arubaos', 'arubaos-aosw');
-        $this->checkOS('arubaos', 'arubaos-powerconnect');
-    }
-
-    public function testAsa()
-    {
-        $this->checkOS('asa');
-    }
-
-    public function testAsuswrtMerlin()
-    {
-        $this->checkOS('asuswrt-merlin');
-    }
-
-    public function testAsyncOS()
-    {
-        $this->checkOS('asyncos');
-    }
-
-    public function testAvayaers()
-    {
-        $this->checkOS('avaya-ers');
-        $this->checkOS('avaya-ers', 'avaya-ers1');
-    }
-
-    public function testAvayaipo()
-    {
-        $this->checkOS('avaya-ipo');
-        $this->checkOS('avaya-ipo', 'avaya-ipo-server');
-    }
-
-    public function testAvayavsp()
-    {
-        $this->checkOS('avaya-vsp', 'avaya-vsp-4850gts');
-        $this->checkOS('avaya-vsp', 'avaya-vsp-4850gts-pwr');
-        $this->checkOS('avaya-vsp', 'avaya-vsp-8284xsq');
-        $this->checkOS('avaya-vsp', 'avaya-vsp-4450gsx-pwr');
-        $this->checkOS('avaya-vsp', 'avaya-vsp-8404');
-        $this->checkOS('avaya-vsp', 'avaya-vsp-7254xsq');
-        $this->checkOS('avaya-vsp', 'avaya-vsp-7254xtq');
-        $this->checkOS('avaya-vsp', 'avaya-vsp-7024xls');
-    }
-
-    public function testAvocent()
-    {
-        $this->checkOS('avocent');
-        $this->checkOS('avocent', 'avocent-alterpath');
-        $this->checkOS('avocent', 'avocent-cyclades-acs6000');
-    }
-
-    public function testAvtech()
-    {
-        $this->checkOS('avtech', 'avtech-tempager4e');
-    }
-
-    public function testAvrhd()
-    {
-        $this->checkOS('avr-hd');
-    }
-
-    public function testAxiscam()
-    {
-        $this->checkOS('axiscam');
-        $this->checkOS('axiscam', 'axiscam-p1354');
-        $this->checkOS('axiscam', 'axiscam-nve');
-    }
-
-    public function testAxisdocserver()
-    {
-        $this->checkOS('axisdocserver');
-    }
-
-    public function testBarracudaloadbalancer()
-    {
-        $this->checkOS('barracudaloadbalancer');
-        $this->checkOS('barracudaloadbalancer', 'barracudaloadbalancer-adc');
-    }
-
-    public function testBarracudaspamfirewall()
-    {
-        $this->checkOS('barracudaspamfirewall');
-    }
-
-    public function testBarracudangfirewall()
-    {
-        $this->checkOS('barracudangfirewall');
-    }
-
-    public function testBcm963()
-    {
-        $this->checkOS('bcm963');
-    }
-
-    public function testBdcom()
-    {
-        $this->checkOS('bdcom');
-    }
-
-    public function testBinos()
-    {
-        $this->checkOS('binos');
-    }
-
-    public function testBinox()
-    {
-        $this->checkOS('binox');
-    }
-
-    public function testBintecsmart()
-    {
-        $this->checkOS('bintec-smart');
-    }
-
-    public function testBnt()
-    {
-        $this->checkOS('bnt');
-        $this->checkOS('bnt', 'bnt1');
-    }
-
-    public function testBreeze()
-    {
-        $this->checkOS('breeze');
-    }
-
-    public function testBrother()
-    {
-        $this->checkOS('brother');
-    }
-
-    public function testBuffalo()
-    {
-        $this->checkOS('buffalo');
-    }
-
-    public function testCalix()
-    {
-        $this->checkOS('calix');
-        $this->checkOS('calix', 'calix1');
-        $this->checkOS('calix', 'calix-e7-2');
-    }
-
-    public function testCambium()
-    {
-        $this->checkOS('cambium');
-        $this->checkOS('cambium', 'cambium-ptp');
-        $this->checkOS('cambium', 'cambium-ptp250');
-        $this->checkOS('cambium', 'cambium-ptp50650');
-    }
-
-    public function testCanonprinter()
-    {
-        $this->checkOS('canonprinter', 'canonprinter-mf');
-        $this->checkOS('canonprinter', 'canonprinter-ir-adv');
-        $this->checkOS('canonprinter', 'canonprinter-lbp');
-        $this->checkOS('canonprinter', 'canon-d1180');
-    }
-
-    public function testCanopy()
-    {
-        $this->checkOS('canopy');
-        $this->checkOS('canopy', 'canopy-cmm');
-    }
-
-    public function testCat1900()
-    {
-        $this->checkOS('cat1900');
-    }
-
-    public function testCatos()
-    {
-        $this->checkOS('catos');
-    }
-
-    public function testCeraos()
-    {
-        $this->checkOS('ceraos');
-    }
-
-    public function testCelvin()
-    {
-        $this->checkOS('celvin');
-    }
-
-    public function testCienaSDS()
-    {
-        $this->checkOS('ciena-sds');
-    }
-
-    public function testCimc()
-    {
-        $this->checkOS('cimc');
-    }
-
-    public function testCips()
-    {
-        $this->checkOS('cips');
-    }
-
-    public function testCiscosb()
-    {
-        $this->checkOS('ciscosb');
-        $this->checkOS('ciscosb', 'ciscosb1');
-        $this->checkOS('ciscosb', 'ciscosb2');
-        $this->checkOS('ciscosb', 'ciscosb3');
-        $this->checkOS('ciscosb', 'ciscosb4');
-        $this->checkOS('ciscosb', 'ciscosb5');
-        $this->checkOS('ciscosb', 'ciscosb6');
-        $this->checkOS('ciscosb', 'ciscosb7');
-        $this->checkOS('ciscosb', 'ciscosb8');
-        $this->checkOS('ciscosb', 'ciscosb9');
-        $this->checkOS('ciscosb', 'ciscosb10');
-        $this->checkOS('ciscosb', 'ciscosb11');
-        $this->checkOS('ciscosb', 'ciscosb12');
-        $this->checkOS('ciscosb', 'ciscosb-srw2008');
-        $this->checkOS('ciscosb', 'ciscosb-srw2008p');
-        $this->checkOS('ciscosb', 'ciscosb-srw208');
-        $this->checkOS('ciscosb', 'ciscosb-srw208mp');
-    }
-
-    public function testCiscosmblinux()
-    {
-        $this->checkOS('ciscosmblinux');
-    }
-
-    public function testCiscowap()
-    {
-        $this->checkOS('ciscowap');
-    }
-
-    public function testCiscowlc()
-    {
-        $this->checkOS('ciscowlc');
-        $this->checkOS('ciscowlc', 'ciscowlc1');
-        $this->checkOS('ciscowlc', 'ciscowlc2');
-    }
-
-    public function testClearPass()
-    {
-        $this->checkOS('clearpass');
-    }
-
-    public function testCmts()
-    {
-        $this->checkOS('cmts');
-    }
-
-    public function testCometsystemp85xx()
-    {
-        $this->checkOS('cometsystem-p85xx');
-    }
-
-    public function testCommanderPlus()
-    {
-        $this->checkOS('commander-plus');
-    }
-
-    public function testComware()
-    {
-        $this->checkOS('comware');
-        $this->checkOS('comware', 'comware1');
-        $this->checkOS('comware', 'comware-h3c');
-    }
-
-    public function testCoriant()
-    {
-        $this->checkOS('coriant');
-    }
-
-    public function testCtcu()
-    {
-        $this->checkOS('ctcu');
-        $this->checkOS('ctcu', 'ctcu1');
-        $this->checkOS('ctcu', 'ctcu2');
-        $this->checkOS('ctcu', 'ctcu3');
-    }
-
-    public function testCucm()
-    {
-        $this->checkOS('cucm');
-    }
-
-    public function testCumulus()
-    {
-        $this->checkOS('cumulus');
-    }
-
-    public function testCyan()
-    {
-        $this->checkOS('cyan', 'cyan-z33');
-    }
-
-    public function testCyberoamUtm()
-    {
-        $this->checkOS('cyberoam-utm');
-    }
-
-    public function testCyberpower()
-    {
-        $this->checkOS('cyberpower');
-    }
-
-    public function testDasanNos()
-    {
-        $this->checkOS('dasan-nos');
-        $this->checkOS('dasan-nos', 'dasan-nos1');
-        $this->checkOS('dasan-nos', 'dasan-nos2');
-    }
-
-    public function testDatacom()
-    {
-        $this->checkOS('datacom');
-    }
-
-    public function testDatadomain()
-    {
-        $this->checkOS('datadomain');
-    }
-
-    public function testDcnSoftware()
-    {
-        $this->checkOS('dcn-software');
-        $this->checkOS('dcn-software', 'dcn-software1');
-    }
-
-    public function testDdnos()
-    {
-        $this->checkOS('ddnos');
-    }
-
-    public function testDeliberant()
-    {
-        $this->checkOS('deliberant');
-    }
-
-    public function testDellrcs()
-    {
-        $this->checkOS('dell-rcs');
-    }
-
-    public function testDelllaser()
-    {
-        $this->checkOS('dell-laser');
-        $this->checkOS('dell-laser', 'dell-laser-color');
-        $this->checkOS('dell-laser', 'dell-laser-mfp');
-    }
-
-    public function testDellups()
-    {
-        $this->checkOS('dell-ups');
-    }
-
-    public function testDeltaups()
-    {
-        $this->checkOS('deltaups');
-    }
-
-    public function testDevelopprinter()
-    {
-        $this->checkOS('developprinter');
-    }
-
-    public function testDigipower()
-    {
-        $this->checkOS('digipower');
-    }
-
-    public function testDlinkap()
-    {
-        $this->checkOS('dlinkap');
-        $this->checkOS('dlinkap', 'dlinkap1');
-        $this->checkOS('dlinkap', 'dlinkap2');
-    }
-
-    public function testDlink()
-    {
-        $this->checkOS('dlink', 'dlink-des');
-        $this->checkOS('dlink', 'dlink-des1');
-        $this->checkOS('dlink', 'dlink-des2');
-        $this->checkOS('dlink', 'dlink-dgs');
-    }
-
-    public function testDnos()
-    {
-        $this->checkOS('dnos');
-    }
-
-    public function testDrac()
-    {
-        $this->checkOS('drac');
-        $this->checkOS('drac', 'drac1');
-        $this->checkOS('drac', 'drac2');
-    }
-
-    public function testDragonfly()
-    {
-        $this->checkOS('dragonfly');
-    }
-
-    public function testDraytek()
-    {
-        $this->checkOS('draytek');
-    }
-
-    public function testDsm()
-    {
-        $this->checkOS('dsm');
-        $this->checkOS('dsm', 'dsm-ds214');
-        $this->checkOS('dsm', 'dsm-ds916');
-    }
-
-    public function testEatonMgeups()
-    {
-        $this->checkOS('eaton-mgeups', 'eaton-5p');
-        $this->checkOS('eaton-mgeups', 'eaton-5px');
-        $this->checkOS('eaton-mgeups', 'mgeups-ex2200');
-        $this->checkOS('eaton-mgeups', 'mgeups-pulsar');
-        $this->checkOS('eaton-mgeups', 'mgeups-evolution');
-        $this->checkOS('eaton-mgeups', 'mgeups-proxy');
-        $this->checkOS('eaton-mgeups', 'mgeups-comet');
-    }
-
-    public function testEatonpdu()
-    {
-        $this->checkOS('eatonpdu');
-    }
-
-    public function testEatonups()
-    {
-        $this->checkOS('eatonups');
-        $this->checkOS('eatonups', 'eaton-powerxpert');
-    }
-
-    public function testEdgecos()
-    {
-        $this->checkOS('edgecos', 'edgecos-es3528m');
-        $this->checkOS('edgecos', 'edgecos-ecs4120-28f');
-        $this->checkOS('edgecos', 'edgecos-es3528mv2');
-        $this->checkOS('edgecos', 'edgecos-ecs4510-28f');
-        $this->checkOS('edgecos', 'edgecos-ecs4510-52t');
-        $this->checkOS('edgecos', 'edgecos-ecs4210-28t');
-        $this->checkOS('edgecos', 'edgecos-ecs3510-52t');
-    }
-
-    public function testEdgeos()
-    {
-        $this->checkOS('edgeos');
-        $this->checkOS('edgeos', 'edgeos-erl');
-        $this->checkOS('edgeos', 'edgeos-er');
-    }
-
-    public function testEdgeswitch()
-    {
-        $this->checkOS('edgeswitch');
-        $this->checkOS('edgeswitch', 'edgeswitch-ep-s16');
-        $this->checkOS('edgeswitch', 'edgeswitch-es-24-250w');
-        $this->checkOS('edgeswitch', 'unifiswitch');
-    }
-
-    public function testEltexOLT()
-    {
-        $this->checkOS('eltex-olt');
-    }
-
-    public function testEndian()
-    {
-        $this->checkOS('endian');
-    }
-
-    public function testEngenius()
-    {
-        $this->checkOS('engenius');
-        $this->checkOS('engenius', 'engenius1');
-        $this->checkOS('engenius', 'engenius2');
-    }
-
-    public function testEnlogicPDU()
-    {
-        $this->checkOS('enlogic-pdu');
-    }
-
-    public function testEnterasys()
-    {
-        $this->checkOS('enterasys');
-        $this->checkOS('enterasys', 'enterasys1');
-    }
-
-    public function testEpson()
-    {
-        $this->checkOS('epson');
-    }
-
-    public function testEquallogic()
-    {
-        $this->checkOS('equallogic');
-    }
-
-    public function testEricssonES()
-    {
-        $this->checkOS('ericsson-es');
-    }
-
-    public function testEtherwan()
-    {
-        $this->checkOS('etherwan');
-    }
-
-    public function testExinda()
-    {
-        $this->checkOS('exinda');
-    }
-
-    public function testExtendAir()
-    {
-        $this->checkOS('extendair');
-    }
-
-    public function testExtrahop()
-    {
-        $this->checkOS('extrahop');
-    }
-
-    public function testExtremeware()
-    {
-        $this->checkOS('extremeware');
-    }
-
-    public function testF5()
-    {
-        $this->checkOS('f5');
-    }
-
-    public function testFabos()
-    {
-        $this->checkOS('fabos');
-        $this->checkOS('fabos', 'fabos1');
-        $this->checkOS('fabos', 'fabos2');
-        $this->checkOS('fabos', 'fabos3');
-    }
-
-    public function testFiberhome()
-    {
-
-        $this->checkOS('fiberhome', 'fiberhome-an5516-01');
-        $this->checkOS('fiberhome', 'fiberhome-an5516-06');
-    }
-
-    public function testFireware()
-    {
-        $this->checkOS('fireware', 'fireware-m400');
-        $this->checkOS('fireware', 'fireware-xtm26w');
-    }
-
-    public function testFlareos()
-    {
-        $this->checkOS('flareos');
-    }
-
-    public function testFortigate()
-    {
-        $this->checkOS('fortigate');
-        $this->checkOS('fortigate', 'fortigate1');
-    }
-
-    public function testFortios()
-    {
-        $this->checkOS('fortios');
-    }
-
-    public function testFortiswitch()
-    {
-        $this->checkOS('fortiswitch');
-    }
-
-    public function testFortiwlc()
-    {
-        $this->checkOS('fortiwlc');
-    }
-
-    public function testFoundryos()
-    {
-        $this->checkOS('foundryos');
-    }
-
-    public function testFreebsd()
-    {
-        $this->checkOS('freebsd');
-        $this->checkOS('freebsd', 'freebsd-freenas');
-    }
-
-    public function testFtos()
-    {
-        $this->checkOS('ftos');
-    }
-
-    public function testFujitsupyos()
-    {
-        $this->checkOS('fujitsupyos');
-        $this->checkOS('fujitsupyos', 'fujitsupyos-10gbe');
-    }
-
-    public function testFujitsueternusos()
-    {
-        $this->checkOS('fujitsueternusos');
-    }
-
-    public function testFxos()
-    {
-        $this->checkOS('fxos');
-    }
-
-    public function testGaia()
-    {
-        $this->checkOS('gaia');
-        $this->checkOS('gaia', 'gaia1');
-    }
-
-    public function testGamatronicups()
-    {
-        $this->checkOS('gamatronicups');
-    }
-
-    public function testGeups()
-    {
-        $this->checkOS('ge-ups');
-    }
-
-    public function testGeistWatchdog()
-    {
-        $this->checkOS('geist-watchdog');
-    }
-
-    public function testGenerexUps()
-    {
-        $this->checkOS('generex-ups');
-        $this->checkOS('generex-ups', 'generex-ups1');
-        $this->checkOS('generex-ups', 'generex-ups2');
-        $this->checkOS('generex-ups', 'generex-ups3');
-    }
-
-    public function testHelios()
-    {
-        $this->checkOS('helios');
-    }
-
-    public function testHikvision()
-    {
-        $this->checkOS('hikvision');
-    }
-
-    public function testHirschmann()
-    {
-        $this->checkOS('hirschmann');
-    }
-
-    public function testHp3par()
-    {
-        $this->checkOS('informos');
-    }
-
-    public function testHpblmos()
-    {
-        $this->checkOS('hpblmos');
-    }
-
-    public function testHpeIlo()
-    {
-        $this->checkOS('hpe-ilo');
-    }
-
-    public function testHpeIpdu()
-    {
-        $this->checkOS('hpe-ipdu');
-    }
-
-    public function testHpeMsl()
-    {
-        $this->checkOS('hpe-msl');
-    }
-
-    public function testHpeMsa()
-    {
-        $this->checkOS('hpe-msa');
-    }
-
-    public function testHpmsm()
-    {
-        $this->checkOS('hpmsm');
-    }
-
-    public function testHpvc()
-    {
-        $this->checkOS('hpvc');
-    }
-
-    public function testHuaweiups()
-    {
-        $this->checkOS('huaweiups');
-    }
-
-    public function testHwgposeidon()
-    {
-        $this->checkOS('hwg-poseidon');
-    }
-
-    public function testHwgste2()
-    {
-        $this->checkOS('hwg-ste2');
-    }
-
-    public function testHwgste()
-    {
-        $this->checkOS('hwg-ste');
-    }
-
-    public function testHytera()
-    {
-        $this->checkOS('hytera');
-    }
-
-    public function testIbmamm()
-    {
-        $this->checkOS('ibm-amm');
-    }
-
-    public function testIbmimm()
-    {
-        $this->checkOS('ibm-imm');
-    }
-
-    public function testIbmnos()
-    {
-        $this->checkOS('ibmnos');
-        $this->checkOS('ibmnos', 'ibmnos1');
-        $this->checkOS('ibmnos', 'ibmnos-flex');
-        $this->checkOS('ibmnos', 'ibmnos-flex-lenovo-en4093r');
-    }
-
-    public function testIbmtl()
-    {
-        $this->checkOS('ibmtl');
-    }
-
-    public function testIctpdu()
-    {
-        $this->checkOS('ict-pdu');
-    }
-
-    public function testIctpsu()
-    {
-        $this->checkOS('ict-psu');
-    }
-
-    public function testIes()
-    {
-        $this->checkOS('ies');
-        $this->checkOS('ies', 'ies1');
-    }
-
-    public function testInfinity()
-    {
-        $this->checkOS('infinity');
-    }
-
-    public function testInformos()
-    {
-        $this->checkOS('informos');
-    }
-
-    public function testIos()
-    {
-        $this->checkOS('ios');
-        $this->checkOS('ios', 'ios1');
-        $this->checkOS('ios', 'ios2');
-        $this->checkOS('ios', 'ios-c3825');
-    }
-
-    public function testIosxe()
-    {
-        $this->checkOS('iosxe');
-        $this->checkOS('iosxe', 'iosxe-asr1000');
-        $this->checkOS('iosxe', 'iosxe-c4500');
-    }
-
-    public function testIosxr()
-    {
-        $this->checkOS('iosxr');
-    }
-
-    public function testIpecs()
-    {
-        $this->checkOS('ipecs', 'ipecs-ucp100');
-        $this->checkOS('ipecs', 'ipecs-ucp600');
-    }
-
-    public function testIpoman()
-    {
-        $this->checkOS('ipoman');
-    }
-
-    public function testIronware()
-    {
-        $this->checkOS('ironware');
-    }
-
-    public function testIse()
-    {
-        $this->checkOS('ise');
-        $this->checkOS('ise', 'ise1');
-        $this->checkOS('ise', 'ise2');
-    }
-
-    public function testJetdirect()
-    {
-        $this->checkOS('jetdirect');
-        $this->checkOS('jetdirect', 'jetdirect1');
-        $this->checkOS('jetdirect', 'jetdirect2');
-    }
-
-    public function testJetstream()
-    {
-        $this->checkOS('jetstream');
-    }
-
-    public function testJuniperex2500os()
-    {
-        $this->checkOS('juniperex2500os');
-    }
-
-    public function testJuniperMss()
-    {
-        $this->checkOS('juniper-mss');
-    }
-
-    public function testJunose()
-    {
-        $this->checkOS('junose');
-    }
-
-    public function testJunos()
-    {
-        $this->checkOS('junos');
-        $this->checkOS('junos', 'junos1');
-    }
-
-    public function testJwos()
-    {
-        $this->checkOS('jwos');
-    }
-
-    public function testKemp()
-    {
-        $this->checkOS('kemp');
-    }
-
-    public function testKti()
-    {
-        $this->checkOS('kti');
-    }
-
-    public function testKonica()
-    {
-        $this->checkOS('konica');
-    }
-
-    public function testKyocera()
-    {
-        $this->checkOS('kyocera');
-    }
-
-    public function testLanier()
-    {
-        $this->checkOS('lanier');
-    }
-
-    public function testLantronixslc()
-    {
-        $this->checkOS('lantronix-slc');
-    }
-
-    public function testLantronixuds()
-    {
-        $this->checkOS('lantronix-uds');
-    }
-
-    public function testLcos()
-    {
-        $this->checkOS('lcos');
-        $this->checkOS('lcos', 'lcos1');
-    }
-
-    public function testLenovoemc()
-    {
-        $this->checkOS('lenovoemc');
-    }
-
-    public function testLexmarkprinter()
-    {
-        $this->checkOS('lexmarkprinter');
-    }
-
-    public function testLiebert()
-    {
-        $this->checkOS('liebert');
-    }
-
-    public function testLigoos()
-    {
-        $this->checkOS('ligoos');
-    }
-
-    public function testLinksysSS()
-    {
-        $this->checkOS('linksys-ss', 'linksys-lgs308p');
-    }
-
-    public function testLinux()
-    {
-        $this->checkOS('linux');
-        $this->checkOS('linux', 'linux1');
-    }
-
-    public function testMacosx()
-    {
-        $this->checkOS('macosx');
-        $this->checkOS('macosx', 'macosx-sierra');
-    }
-
-    public function testMagnum()
-    {
-        $this->checkOS('magnum');
-    }
-
-    public function testMaipu()
-    {
-        $this->checkOS('mypoweros');
-    }
-
-    public function testMbgLtos6()
-    {
-        $this->checkOS('mbg-ltos6');
-    }
-
-    public function testMellanox()
-    {
-        $this->checkOS('mellanox');
-        $this->checkOS('mellanox', 'mellanox-i5035');
-    }
-
-    public function testMerakimr()
-    {
-        $this->checkOS('merakimr');
-    }
-
-    public function testMerakims()
-    {
-        $this->checkOS('merakims');
-    }
-
-    public function testMerakimx()
-    {
-        $this->checkOS('merakimx');
-    }
-
-    public function testMgepdu()
-    {
-        $this->checkOS('mgepdu');
-    }
-
-    public function testMicrosemitime()
-    {
-        $this->checkOS('microsemitime');
-    }
-
-    public function testMimosa()
-    {
-        $this->checkOS('mimosa');
-    }
-
-    public function testMinkelsrms()
-    {
-        $this->checkOS('minkelsrms');
-    }
-
-    public function testMirth()
-    {
-        $this->checkOS('mirth');
-    }
-
-    public function testMonowall()
-    {
-        $this->checkOS('monowall');
-    }
-
-    public function testMoxaNport()
-    {
-        $this->checkOS('moxa-nport');
-    }
-
-    public function testMoxaEtherdevice()
-    {
-        $this->checkOS('moxa-etherdevice');
-    }
-
-    public function testMrvld()
-    {
-        $this->checkOS('mrvld');
-    }
-
-    public function testMypoweros()
-    {
-        $this->checkOS('mypoweros');
-    }
-
-    public function testNetagent2()
-    {
-        $this->checkOS('netagent2');
-    }
-
-    public function testNetapp()
-    {
-        $this->checkOS('netapp');
-    }
-
-    public function testNetbsd()
-    {
-        $this->checkOS('netbsd');
-    }
-
-    public function testNetbotz()
-    {
-        $this->checkOS('netbotz', 'netbotz-2014');
-        $this->checkOS('netbotz', 'netbotz-2016');
-        $this->checkOS('netbotz', 'netbotz-2017');
-    }
-
-    public function testNetgear()
-    {
-        $this->checkOS('netgear');
-        $this->checkOS('netgear', 'netgear1');
-        $this->checkOS('netgear', 'netgear2');
-    }
-
-    public function testNetmanplus()
-    {
-        $this->checkOS('netmanplus');
-        $this->checkOS('netmanplus', 'netmanplus1');
-    }
-
-    public function testNetonix()
-    {
-        $this->checkOS('netonix', 'netonix-wispswitch');
-    }
-
-    public function testNetopia()
-    {
-        $this->checkOS('netopia');
-    }
-
-    public function testNetscaler()
-    {
-        $this->checkOS('netscaler');
-        $this->checkOS('netscaler', 'netscaler-sdx');
-    }
-
-    public function testNetvision()
-    {
-        $this->checkOS('netvision');
-    }
-
-    public function testNetware()
-    {
-        $this->checkOS('netware');
-    }
-
-    public function testNimbleos()
-    {
-        $this->checkOS('nimbleos');
-    }
-
-    public function testNios()
-    {
-        $this->checkOS('nios');
-        $this->checkOS('nios', 'nios-ipam');
-    }
-
-    public function testNitro()
-    {
-        $this->checkOS('nitro');
-        $this->checkOS('nitro', 'nitro1');
-        $this->checkOS('nitro', 'nitro2');
-        $this->checkOS('nitro', 'nitro3');
-    }
-
-    public function testNos()
-    {
-        $this->checkOS('nos');
-        $this->checkOS('nos', 'nos1');
-        $this->checkOS('nos', 'nos2');
-    }
-
-    public function testNrg()
-    {
-        $this->checkOS('nrg');
-    }
-
-    public function testNxos()
-    {
-        $this->checkOS('nxos');
-    }
-
-    public function testOkilan()
-    {
-        $this->checkOS('okilan');
-    }
-
-    public function testOmnitronIConverter()
-    {
-        $this->checkOS('omnitron-iconverter');
-    }
-
-    public function testOnefs()
-    {
-        $this->checkOS('onefs');
-        $this->checkOS('onefs', 'onefs-v8');
-    }
-
-    public function testOns()
-    {
-        $this->checkOS('ons');
-    }
-
-    public function testOpenbsd()
-    {
-        $this->checkOS('openbsd');
-        $this->checkOS('openbsd', 'openbsd1');
-    }
-
-    public function testOpengear()
-    {
-        $this->checkOS('opengear');
-        $this->checkOS('opengear', 'opengear1');
-    }
-
-    public function testOpenindiana()
-    {
-        $this->checkOS('openindiana');
-    }
-
-    public function testOpensolaris()
-    {
-        $this->checkOS('opensolaris');
-    }
-
-    public function testOracleilom()
-    {
-        $this->checkOS('oracle-ilom');
-    }
-
-    public function testPacketshaper()
-    {
-        $this->checkOS('packetshaper');
-    }
-
-    public function testPanos()
-    {
-        $this->checkOS('panos');
-    }
-
-    public function testPapouchtme()
-    {
-        $this->checkOS('papouch-tme');
-        $this->checkOS('papouch-tme', 'papouch-tme1');
-    }
-
-    public function testPbn()
-    {
-        $this->checkOS('pbn');
-    }
-
-    public function testPbnCp()
-    {
-        $this->checkOS('pbn-cp');
-    }
-
-    public function testPcoweb()
-    {
-        $this->checkOS('pcoweb');
-    }
-
-    public function testPerle()
-    {
-        $this->checkOS('perle');
-    }
-
-    public function testPfsense()
-    {
-        $this->checkOS('pfsense');
-    }
-
-    public function testPixos()
-    {
-        $this->checkOS('pixos');
-    }
-
-    public function testPktj()
-    {
-        $this->checkOS('pktj');
-    }
-
-    public function testPlanetos()
-    {
-        $this->checkOS('planetos');
-        $this->checkOS('planetos', 'planetos1');
-        $this->checkOS('planetos', 'planetos-gs-5220-16s8c');
-        $this->checkOS('planetos', 'planetos-sgsw-24240');
-    }
-
-    public function testPoweralert()
-    {
-        $this->checkOS('poweralert');
-        $this->checkOS('poweralert', 'poweralert1');
-    }
-
-    public function testPowercode()
-    {
-        $this->checkOS('powercode');
-    }
-
-    public function testPowerconnect()
-    {
-        $this->checkOS('powerconnect');
-        $this->checkOS('powerconnect', 'powerconnect-3004');
-        $this->checkOS('powerconnect', 'powerconnect-3011');
-        $this->checkOS('powerconnect', 'powerconnect-3019');
-        $this->checkOS('powerconnect', 'powerconnect-3031');
-        $this->checkOS('powerconnect', 'powerconnect-3041');
-        $this->checkOS('powerconnect', 'powerconnect1');
-        $this->checkOS('powerconnect', 'powerconnect2');
-        $this->checkOS('powerconnect', 'powerconnect3');
-        $this->checkOS('powerconnect', 'powerconnect4');
-        $this->checkOS('powerconnect', 'powerconnect5');
-        $this->checkOS('powerconnect', 'powerconnect6');
-        $this->checkOS('powerconnect', 'powerconnect7');
-        $this->checkOS('powerconnect', 'powerconnect8');
-        $this->checkOS('powerconnect', 'powerconnect9');
-        $this->checkOS('powerconnect', 'powerconnect10');
-        $this->checkOS('powerconnect', 'powerconnect11');
-        $this->checkOS('powerconnect', 'powerconnect12');
-        $this->checkOS('powerconnect', 'powerconnect13');
-    }
-
-    public function testPowervault()
-    {
-        $this->checkOS('powervault');
-    }
-
-    public function testPowerwalker()
-    {
-        $this->checkOS('powerwalker');
-    }
-
-    public function testPrestige()
-    {
-        $this->checkOS('prestige');
-    }
-
-    public function testPrimeinfrastructure()
-    {
-        $this->checkOS('primeinfrastructure');
-    }
-
-    public function testProcera()
-    {
-        $this->checkOS('procera');
-    }
-
-    public function testProcurve()
-    {
-        $this->checkOS('procurve');
-        $this->checkOS('procurve', 'procurve-131');
-        $this->checkOS('procurve', 'procurve-151');
-        $this->checkOS('procurve', 'procurve-167-hp');
-        $this->checkOS('procurve', 'procurve-167-hpe');
-        $this->checkOS('procurve', 'procurve-50-procurve');
-        $this->checkOS('procurve', 'procurve-66');
-    }
-
-    public function testProxim()
-    {
-        $this->checkOS('proxim');
-    }
-
-    public function testPulse()
-    {
-        $this->checkOS('pulse');
-        $this->checkOS('pulse', 'pulse-mag2600');
-        $this->checkOS('pulse', 'pulse-sa2500');
-        $this->checkOS('pulse', 'pulse-sa6500');
-        $this->checkOS('pulse', 'pulse-vaspe');
-        $this->checkOS('pulse', 'pulse-sa');
-    }
-
-    public function testQnap()
-    {
-        $this->checkOS('qnap');
-        $this->checkOS('qnap', 'qnap-ts431');
-    }
-
-    public function testQuanta()
-    {
-        $this->checkOS('quanta');
-        $this->checkOS('quanta', 'quanta1');
-        $this->checkOS('quanta', 'quanta2');
-        $this->checkOS('quanta', 'quanta3');
-        $this->checkOS('quanta', 'quanta-lb9');
-    }
-
-    public function testRadlan()
-    {
-        $this->checkOS('radlan');
-    }
-
-    public function testRadwin()
-    {
-        $this->checkOS('radwin');
-    }
-
-    public function testRaisecom()
-    {
-        $this->checkOS('raisecom');
-        $this->checkOS('raisecom', 'raisecom-ros');
-    }
-
-    public function testRaritan()
-    {
-        $this->checkOS('raritan');
-        $this->checkOS('raritan', 'raritan-px2');
-    }
-
-    public function testSEOS()
-    {
-        $this->checkOS('seos');
-    }
-
-    public function testRicoh()
-    {
-        $this->checkOS('ricoh');
-        $this->checkOS('ricoh', 'ricoh-aficio');
-    }
-
-    public function testRiverbed()
-    {
-        $this->checkOS('riverbed');
-    }
-
-    public function testRouteros()
-    {
-        $this->checkOS('routeros');
-        $this->checkOS('routeros', 'routeros1');
-    }
-
-    public function testRuckuswireless()
-    {
-        $this->checkOS('ruckuswireless');
-    }
-
-    public function testSaf()
-    {
-        $this->checkOS('saf');
-    }
-
-    public function testSamsungprinter()
-    {
-        $this->checkOS('samsungprinter', 'samsungprinter-clx');
-        $this->checkOS('samsungprinter', 'samsungprinter-scx');
-        $this->checkOS('samsungprinter', 'samsungprinter-c');
-        $this->checkOS('samsungprinter', 'samsungprinter-s');
-        $this->checkOS('samsungprinter', 'samsungprinter-ml');
-    }
-
-    public function testSanos()
-    {
-        $this->checkOS('sanos');
-    }
-
-    public function testScopia()
-    {
-        $this->checkOS('scopia');
-    }
-
-    public function testScreenos()
-    {
-        $this->checkOS('screenos');
-        $this->checkOS('screenos', 'screenos1');
-    }
-
-    public function testSentry3()
-    {
-        $this->checkOS('sentry3', 'sentry3-switched');
-        $this->checkOS('sentry3', 'sentry3-smart');
-    }
-
-    public function testSentry4()
-    {
-        $this->checkOS('sentry4', 'sentry4-switched');
-        $this->checkOS('sentry4', 'sentry4-smart');
-    }
-
-    public function testServeriron()
-    {
-        $this->checkOS('serveriron');
-    }
-
-    public function testSgos()
-    {
-        $this->checkOS('sgos');
-    }
-
-    public function testSharp()
-    {
-        $this->checkOS('sharp', 'sharp-mx2614n');
-        $this->checkOS('sharp', 'sharp-mxc301w');
-        $this->checkOS('sharp', 'sharp-mx3140n');
-    }
-
-    public function testSiklu()
-    {
-        $this->checkOS('siklu');
-    }
-
-    public function testSinetica()
-    {
-        $this->checkOS('sinetica');
-    }
-
-    public function testSiteMonitor()
-    {
-        $this->checkOS('sitemonitor');
-    }
-
-    public function testMegatec()
-    {
-        $this->checkOS('netagent2');
-    }
-
-    public function testSlms()
-    {
-        $this->checkOS('slms');
-    }
-
-    public function testSmartax()
-    {
-        $this->checkOS('smartax');
-    }
-
-    public function testSolaris()
-    {
-        $this->checkOS('solaris');
-        $this->checkOS('solaris', 'solaris1');
-    }
-
-    public function testSonicwall()
-    {
-        $this->checkOS('sonicwall');
-    }
-
-    public function testSonusgsx()
-    {
-        $this->checkOS('sonus-gsx');
-    }
-
-    public function testSonussbc()
-    {
-        $this->checkOS('sonus-sbc');
-        $this->checkOS('sonus-sbc', 'sonus-sbc1');
-        $this->checkOS('sonus-sbc', 'sonus-sbc1500');
-    }
-
-    public function testSophos()
-    {
-        $this->checkOS('sophos');
-        $this->checkOS('sophos', 'sophos1');
-    }
-
-    public function testSpeedtouch()
-    {
-        $this->checkOS('speedtouch');
-        $this->checkOS('speedtouch', 'speedtouch-tg585');
-        $this->checkOS('speedtouch', 'speedtouch-st5000');
-    }
-
-    public function testSub10()
-    {
-        $this->checkOS('sub10');
-    }
-
-    public function testSupermicroswitch()
-    {
-        $this->checkOS('supermicro-switch');
-        $this->checkOS('supermicro-switch', 'supermicro-switch-sse');
-        $this->checkOS('supermicro-switch', 'supermicro-switch-sbm');
-    }
-
-    public function testSwos()
-    {
-        $this->checkOS('swos');
-    }
-
-    public function testSymbol()
-    {
-        $this->checkOS('symbol');
-    }
-
-    public function testTeradicipcoip()
-    {
-        $this->checkOS('teradici-pcoip');
-    }
-
-    public function testTimos()
-    {
-        $this->checkOS('timos');
-        $this->checkOS('timos', 'timos1');
-        $this->checkOS('timos', 'timos2');
-        $this->checkOS('timos', 'timos3');
-        $this->checkOS('timos', 'timos4');
-        $this->checkOS('timos', 'timos5');
-        $this->checkOS('timos', 'timos6');
-        $this->checkOS('timos', 'timos7');
-        $this->checkOS('timos', 'timos8');
-        $this->checkOS('timos', 'timos9');
-        $this->checkOS('timos', 'timos10');
-    }
-
-    public function testTomato()
-    {
-        $this->checkOS('tomato');
-    }
-
-    public function testToshibaTec()
-    {
-        $this->checkOS('toshiba-tec', 'toshiba-tec-ev4');
-        $this->checkOS('toshiba-tec', 'toshiba-tec-fv4');
-        $this->checkOS('toshiba-tec', 'toshiba-tec-sx5t');
-    }
-
-    public function testTpconductor()
-    {
-        $this->checkOS('tpconductor');
-    }
-
-    public function testTpdin()
-    {
-        $this->checkOS('tpdin');
-    }
-
-    public function testTplink()
-    {
-        $this->checkOS('tplink');
-        $this->checkOS('tplink', 'tplink1');
-        $this->checkOS('tplink', 'tplink-t1600g-28ts');
-    }
-
-    public function testTranzeo()
-    {
-        $this->checkOS('tranzeo');
-    }
-
-    public function testUnifi()
-    {
-        $this->checkOS('unifi');
-    }
-
-    public function testVccodec()
-    {
-        $this->checkOS('vccodec');
-    }
-
-    public function testVcs()
-    {
-        $this->checkOS('vcs');
-    }
-
-    public function testViprinux()
-    {
-        $this->checkOS('viprinux');
-    }
-
-    public function testVmware()
-    {
-        $this->checkOS('vmware', 'vmware-esx');
-        $this->checkOS('vmware', 'vmware-vcsa');
-    }
-
-    public function testVoswall()
-    {
-        $this->checkOS('voswall');
-    }
-
-    public function testVrp()
-    {
-        $this->checkOS('vrp');
-        $this->checkOS('vrp', 'vrp1');
-        $this->checkOS('vrp', 'vrp2');
-        $this->checkOS('vrp', 'vrp3');
-        $this->checkOS('vrp', 'vrp4');
-    }
-
-    public function testVubiq()
-    {
-        $this->checkOS('vubiq');
-    }
-
-    public function testVyatta()
-    {
-        $this->checkOS('vyatta');
-    }
-
-    public function testVyos()
-    {
-        $this->checkOS('vyos');
-        $this->checkOS('vyos', 'vyos-vyatta');
-    }
-
-    public function testWaas()
-    {
-        $this->checkOS('waas');
-    }
-
-    public function testWebpower()
-    {
-        $this->checkOS('webpower');
-    }
-
-    public function testWindows()
-    {
-        $this->checkOS('windows');
-        $this->checkOS('windows', 'windows1');
-    }
-
-    public function testWxgoos()
-    {
-        $this->checkOS('wxgoos');
-        $this->checkOS('wxgoos', 'wxgoos1');
-    }
-
-    public function testXerox()
-    {
-        $this->checkOS('xerox', 'xerox-color');
-        $this->checkOS('xerox', 'xerox-phaser');
-        $this->checkOS('xerox', 'xerox-workcentre');
-        $this->checkOS('xerox', 'xerox-docuprint');
-    }
-
-    public function testXirrusAos()
-    {
-        $this->checkOS('xirrus_aos');
-    }
-
-    public function testXos()
-    {
-        $this->checkOS('xos');
-    }
-
-    public function testZebra()
-    {
-        $this->checkOS('zebra');
-        $this->checkOS('zebra', 'zebra1');
-    }
-
-    public function testZxr10()
-    {
-        $this->checkOS('zxr10');
-    }
-
-    public function testZynos()
-    {
-        $this->checkOS('zynos', 'zynos-es');
-        $this->checkOS('zynos', 'zynos-gs');
-        $this->checkOS('zynos', 'zynos-mes3528');
-        $this->checkOS('zynos', 'zynos-xs');
-    }
-
-    public function testZywall()
-    {
-        $this->checkOS('zywall');
-        $this->checkOS('zywall', 'zywall1');
-        $this->checkOS('zywall', 'zywall2');
-    }
-
-    public function testZyxelnwa()
-    {
-        $this->checkOS('zyxelnwa');
-        $this->checkOS('zyxelnwa', 'zyxelnwa1');
+        return $all_os;
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a482ac5b76..f47599c3b6 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -47,6 +47,7 @@ chdir($install_dir);
 ini_set('display_errors', 1);
 error_reporting(E_ALL & ~E_WARNING);
 
+load_all_os();  // pre-load OS so we don't keep loading them
 
 if (getenv('DBTEST')) {
     global $schema, $sql_mode;
diff --git a/tests/snmpsim/3com1.snmprec b/tests/snmpsim/3com_1.snmprec
similarity index 100%
rename from tests/snmpsim/3com1.snmprec
rename to tests/snmpsim/3com_1.snmprec
diff --git a/tests/snmpsim/3com2.snmprec b/tests/snmpsim/3com_2.snmprec
similarity index 100%
rename from tests/snmpsim/3com2.snmprec
rename to tests/snmpsim/3com_2.snmprec
diff --git a/tests/snmpsim/acsw1.snmprec b/tests/snmpsim/acsw_1.snmprec
similarity index 100%
rename from tests/snmpsim/acsw1.snmprec
rename to tests/snmpsim/acsw_1.snmprec
diff --git a/tests/snmpsim/acsw2.snmprec b/tests/snmpsim/acsw_2.snmprec
similarity index 100%
rename from tests/snmpsim/acsw2.snmprec
rename to tests/snmpsim/acsw_2.snmprec
diff --git a/tests/snmpsim/adtran-aos1.snmprec b/tests/snmpsim/adtran-aos_1.snmprec
similarity index 100%
rename from tests/snmpsim/adtran-aos1.snmprec
rename to tests/snmpsim/adtran-aos_1.snmprec
diff --git a/tests/snmpsim/aen1.snmprec b/tests/snmpsim/aen_1.snmprec
similarity index 100%
rename from tests/snmpsim/aen1.snmprec
rename to tests/snmpsim/aen_1.snmprec
diff --git a/tests/snmpsim/aen2.snmprec b/tests/snmpsim/aen_2.snmprec
similarity index 100%
rename from tests/snmpsim/aen2.snmprec
rename to tests/snmpsim/aen_2.snmprec
diff --git a/tests/snmpsim/airos1.snmprec b/tests/snmpsim/airos_1.snmprec
similarity index 100%
rename from tests/snmpsim/airos1.snmprec
rename to tests/snmpsim/airos_1.snmprec
diff --git a/tests/snmpsim/airos2.snmprec b/tests/snmpsim/airos_2.snmprec
similarity index 100%
rename from tests/snmpsim/airos2.snmprec
rename to tests/snmpsim/airos_2.snmprec
diff --git a/tests/snmpsim/airport1.snmprec b/tests/snmpsim/airport_2.snmprec
similarity index 100%
rename from tests/snmpsim/airport1.snmprec
rename to tests/snmpsim/airport_2.snmprec
diff --git a/tests/snmpsim/airport2.snmprec b/tests/snmpsim/airport_3.snmprec
similarity index 100%
rename from tests/snmpsim/airport2.snmprec
rename to tests/snmpsim/airport_3.snmprec
diff --git a/tests/snmpsim/akcp1.snmprec b/tests/snmpsim/akcp_1.snmprec
similarity index 100%
rename from tests/snmpsim/akcp1.snmprec
rename to tests/snmpsim/akcp_1.snmprec
diff --git a/tests/snmpsim/akcp-securityprobe.snmprec b/tests/snmpsim/akcp_securityprobe.snmprec
similarity index 100%
rename from tests/snmpsim/akcp-securityprobe.snmprec
rename to tests/snmpsim/akcp_securityprobe.snmprec
diff --git a/tests/snmpsim/aos1.snmprec b/tests/snmpsim/aos_1.snmprec
similarity index 100%
rename from tests/snmpsim/aos1.snmprec
rename to tests/snmpsim/aos_1.snmprec
diff --git a/tests/snmpsim/aos-omnistack.snmprec b/tests/snmpsim/aos_omnistack.snmprec
similarity index 100%
rename from tests/snmpsim/aos-omnistack.snmprec
rename to tests/snmpsim/aos_omnistack.snmprec
diff --git a/tests/snmpsim/mgeups-galaxy.snmprec b/tests/snmpsim/apc-mgeups_galaxy.snmprec
similarity index 100%
rename from tests/snmpsim/mgeups-galaxy.snmprec
rename to tests/snmpsim/apc-mgeups_galaxy.snmprec
diff --git a/tests/snmpsim/apc-embedded-powernet.snmprec b/tests/snmpsim/apc_embedded-powernet.snmprec
similarity index 100%
rename from tests/snmpsim/apc-embedded-powernet.snmprec
rename to tests/snmpsim/apc_embedded-powernet.snmprec
diff --git a/tests/snmpsim/apc-masterswitch.snmprec b/tests/snmpsim/apc_masterswitch.snmprec
similarity index 100%
rename from tests/snmpsim/apc-masterswitch.snmprec
rename to tests/snmpsim/apc_masterswitch.snmprec
diff --git a/tests/snmpsim/apc-metered-rack.snmprec b/tests/snmpsim/apc_metered-rack.snmprec
similarity index 100%
rename from tests/snmpsim/apc-metered-rack.snmprec
rename to tests/snmpsim/apc_metered-rack.snmprec
diff --git a/tests/snmpsim/apc-switched-rack.snmprec b/tests/snmpsim/apc_switched-rack.snmprec
similarity index 100%
rename from tests/snmpsim/apc-switched-rack.snmprec
rename to tests/snmpsim/apc_switched-rack.snmprec
diff --git a/tests/snmpsim/areca1.snmprec b/tests/snmpsim/areca_1.snmprec
similarity index 100%
rename from tests/snmpsim/areca1.snmprec
rename to tests/snmpsim/areca_1.snmprec
diff --git a/tests/snmpsim/arubaos-aosw.snmprec b/tests/snmpsim/arubaos_aosw.snmprec
similarity index 100%
rename from tests/snmpsim/arubaos-aosw.snmprec
rename to tests/snmpsim/arubaos_aosw.snmprec
diff --git a/tests/snmpsim/arubaos-powerconnect.snmprec b/tests/snmpsim/arubaos_powerconnect.snmprec
similarity index 100%
rename from tests/snmpsim/arubaos-powerconnect.snmprec
rename to tests/snmpsim/arubaos_powerconnect.snmprec
diff --git a/tests/snmpsim/avaya-ers1.snmprec b/tests/snmpsim/avaya-ers_1.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-ers1.snmprec
rename to tests/snmpsim/avaya-ers_1.snmprec
diff --git a/tests/snmpsim/avaya-ipo-server.snmprec b/tests/snmpsim/avaya-ipo_server.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-ipo-server.snmprec
rename to tests/snmpsim/avaya-ipo_server.snmprec
diff --git a/tests/snmpsim/avaya-vsp-4450gsx-pwr.snmprec b/tests/snmpsim/avaya-vsp_4450gsx-pwr.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-4450gsx-pwr.snmprec
rename to tests/snmpsim/avaya-vsp_4450gsx-pwr.snmprec
diff --git a/tests/snmpsim/avaya-vsp-4850gts-pwr.snmprec b/tests/snmpsim/avaya-vsp_4850gts-pwr.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-4850gts-pwr.snmprec
rename to tests/snmpsim/avaya-vsp_4850gts-pwr.snmprec
diff --git a/tests/snmpsim/avaya-vsp-4850gts.snmprec b/tests/snmpsim/avaya-vsp_4850gts.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-4850gts.snmprec
rename to tests/snmpsim/avaya-vsp_4850gts.snmprec
diff --git a/tests/snmpsim/avaya-vsp-7024xls.snmprec b/tests/snmpsim/avaya-vsp_7024xls.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-7024xls.snmprec
rename to tests/snmpsim/avaya-vsp_7024xls.snmprec
diff --git a/tests/snmpsim/avaya-vsp-7254xsq.snmprec b/tests/snmpsim/avaya-vsp_7254xsq.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-7254xsq.snmprec
rename to tests/snmpsim/avaya-vsp_7254xsq.snmprec
diff --git a/tests/snmpsim/avaya-vsp-7254xtq.snmprec b/tests/snmpsim/avaya-vsp_7254xtq.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-7254xtq.snmprec
rename to tests/snmpsim/avaya-vsp_7254xtq.snmprec
diff --git a/tests/snmpsim/avaya-vsp-8284xsq.snmprec b/tests/snmpsim/avaya-vsp_8284xsq.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-8284xsq.snmprec
rename to tests/snmpsim/avaya-vsp_8284xsq.snmprec
diff --git a/tests/snmpsim/avaya-vsp-8404.snmprec b/tests/snmpsim/avaya-vsp_8404.snmprec
similarity index 100%
rename from tests/snmpsim/avaya-vsp-8404.snmprec
rename to tests/snmpsim/avaya-vsp_8404.snmprec
diff --git a/tests/snmpsim/avocent-alterpath.snmprec b/tests/snmpsim/avocent_alterpath.snmprec
similarity index 100%
rename from tests/snmpsim/avocent-alterpath.snmprec
rename to tests/snmpsim/avocent_alterpath.snmprec
diff --git a/tests/snmpsim/avocent-cyclades-acs6000.snmprec b/tests/snmpsim/avocent_cyclades-acs6000.snmprec
similarity index 100%
rename from tests/snmpsim/avocent-cyclades-acs6000.snmprec
rename to tests/snmpsim/avocent_cyclades-acs6000.snmprec
diff --git a/tests/snmpsim/avtech-tempager4e.snmprec b/tests/snmpsim/avtech_tempager4e.snmprec
similarity index 100%
rename from tests/snmpsim/avtech-tempager4e.snmprec
rename to tests/snmpsim/avtech_tempager4e.snmprec
diff --git a/tests/snmpsim/axiscam-nve.snmprec b/tests/snmpsim/axiscam_nve.snmprec
similarity index 100%
rename from tests/snmpsim/axiscam-nve.snmprec
rename to tests/snmpsim/axiscam_nve.snmprec
diff --git a/tests/snmpsim/axiscam-p1354.snmprec b/tests/snmpsim/axiscam_p1354.snmprec
similarity index 100%
rename from tests/snmpsim/axiscam-p1354.snmprec
rename to tests/snmpsim/axiscam_p1354.snmprec
diff --git a/tests/snmpsim/barracudaloadbalancer-adc.snmprec b/tests/snmpsim/barracudaloadbalancer_adc.snmprec
similarity index 100%
rename from tests/snmpsim/barracudaloadbalancer-adc.snmprec
rename to tests/snmpsim/barracudaloadbalancer_adc.snmprec
diff --git a/tests/snmpsim/bnt1.snmprec b/tests/snmpsim/bnt_1.snmprec
similarity index 100%
rename from tests/snmpsim/bnt1.snmprec
rename to tests/snmpsim/bnt_1.snmprec
diff --git a/tests/snmpsim/calix1.snmprec b/tests/snmpsim/calix_1.snmprec
similarity index 100%
rename from tests/snmpsim/calix1.snmprec
rename to tests/snmpsim/calix_1.snmprec
diff --git a/tests/snmpsim/calix-e7-2.snmprec b/tests/snmpsim/calix_e7-2.snmprec
similarity index 100%
rename from tests/snmpsim/calix-e7-2.snmprec
rename to tests/snmpsim/calix_e7-2.snmprec
diff --git a/tests/snmpsim/cambium-ptp.snmprec b/tests/snmpsim/cambium_ptp.snmprec
similarity index 100%
rename from tests/snmpsim/cambium-ptp.snmprec
rename to tests/snmpsim/cambium_ptp.snmprec
diff --git a/tests/snmpsim/cambium-ptp250.snmprec b/tests/snmpsim/cambium_ptp250.snmprec
similarity index 100%
rename from tests/snmpsim/cambium-ptp250.snmprec
rename to tests/snmpsim/cambium_ptp250.snmprec
diff --git a/tests/snmpsim/cambium-ptp50650.snmprec b/tests/snmpsim/cambium_ptp50650.snmprec
similarity index 100%
rename from tests/snmpsim/cambium-ptp50650.snmprec
rename to tests/snmpsim/cambium_ptp50650.snmprec
diff --git a/tests/snmpsim/canon-d1180.snmprec b/tests/snmpsim/canonprinter_d1180.snmprec
similarity index 100%
rename from tests/snmpsim/canon-d1180.snmprec
rename to tests/snmpsim/canonprinter_d1180.snmprec
diff --git a/tests/snmpsim/canonprinter-ir-adv.snmprec b/tests/snmpsim/canonprinter_ir-adv.snmprec
similarity index 100%
rename from tests/snmpsim/canonprinter-ir-adv.snmprec
rename to tests/snmpsim/canonprinter_ir-adv.snmprec
diff --git a/tests/snmpsim/canonprinter-lbp.snmprec b/tests/snmpsim/canonprinter_lbp.snmprec
similarity index 100%
rename from tests/snmpsim/canonprinter-lbp.snmprec
rename to tests/snmpsim/canonprinter_lbp.snmprec
diff --git a/tests/snmpsim/canonprinter-mf.snmprec b/tests/snmpsim/canonprinter_mf.snmprec
similarity index 100%
rename from tests/snmpsim/canonprinter-mf.snmprec
rename to tests/snmpsim/canonprinter_mf.snmprec
diff --git a/tests/snmpsim/canopy-cmm.snmprec b/tests/snmpsim/canopy_cmm.snmprec
similarity index 100%
rename from tests/snmpsim/canopy-cmm.snmprec
rename to tests/snmpsim/canopy_cmm.snmprec
diff --git a/tests/snmpsim/ciscosb1.snmprec b/tests/snmpsim/ciscosb_1.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb1.snmprec
rename to tests/snmpsim/ciscosb_1.snmprec
diff --git a/tests/snmpsim/ciscosb10.snmprec b/tests/snmpsim/ciscosb_10.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb10.snmprec
rename to tests/snmpsim/ciscosb_10.snmprec
diff --git a/tests/snmpsim/ciscosb11.snmprec b/tests/snmpsim/ciscosb_11.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb11.snmprec
rename to tests/snmpsim/ciscosb_11.snmprec
diff --git a/tests/snmpsim/ciscosb12.snmprec b/tests/snmpsim/ciscosb_12.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb12.snmprec
rename to tests/snmpsim/ciscosb_12.snmprec
diff --git a/tests/snmpsim/ciscosb2.snmprec b/tests/snmpsim/ciscosb_2.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb2.snmprec
rename to tests/snmpsim/ciscosb_2.snmprec
diff --git a/tests/snmpsim/ciscosb3.snmprec b/tests/snmpsim/ciscosb_3.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb3.snmprec
rename to tests/snmpsim/ciscosb_3.snmprec
diff --git a/tests/snmpsim/ciscosb4.snmprec b/tests/snmpsim/ciscosb_4.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb4.snmprec
rename to tests/snmpsim/ciscosb_4.snmprec
diff --git a/tests/snmpsim/ciscosb5.snmprec b/tests/snmpsim/ciscosb_5.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb5.snmprec
rename to tests/snmpsim/ciscosb_5.snmprec
diff --git a/tests/snmpsim/ciscosb6.snmprec b/tests/snmpsim/ciscosb_6.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb6.snmprec
rename to tests/snmpsim/ciscosb_6.snmprec
diff --git a/tests/snmpsim/ciscosb7.snmprec b/tests/snmpsim/ciscosb_7.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb7.snmprec
rename to tests/snmpsim/ciscosb_7.snmprec
diff --git a/tests/snmpsim/ciscosb8.snmprec b/tests/snmpsim/ciscosb_8.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb8.snmprec
rename to tests/snmpsim/ciscosb_8.snmprec
diff --git a/tests/snmpsim/ciscosb9.snmprec b/tests/snmpsim/ciscosb_9.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb9.snmprec
rename to tests/snmpsim/ciscosb_9.snmprec
diff --git a/tests/snmpsim/ciscosb-srw2008.snmprec b/tests/snmpsim/ciscosb_srw2008.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb-srw2008.snmprec
rename to tests/snmpsim/ciscosb_srw2008.snmprec
diff --git a/tests/snmpsim/ciscosb-srw2008p.snmprec b/tests/snmpsim/ciscosb_srw2008p.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb-srw2008p.snmprec
rename to tests/snmpsim/ciscosb_srw2008p.snmprec
diff --git a/tests/snmpsim/ciscosb-srw208.snmprec b/tests/snmpsim/ciscosb_srw208.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb-srw208.snmprec
rename to tests/snmpsim/ciscosb_srw208.snmprec
diff --git a/tests/snmpsim/ciscosb-srw208mp.snmprec b/tests/snmpsim/ciscosb_srw208mp.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb-srw208mp.snmprec
rename to tests/snmpsim/ciscosb_srw208mp.snmprec
diff --git a/tests/snmpsim/ciscowlc1.snmprec b/tests/snmpsim/ciscowlc_1.snmprec
similarity index 100%
rename from tests/snmpsim/ciscowlc1.snmprec
rename to tests/snmpsim/ciscowlc_1.snmprec
diff --git a/tests/snmpsim/ciscowlc2.snmprec b/tests/snmpsim/ciscowlc_2.snmprec
similarity index 100%
rename from tests/snmpsim/ciscowlc2.snmprec
rename to tests/snmpsim/ciscowlc_2.snmprec
diff --git a/tests/snmpsim/comware1.snmprec b/tests/snmpsim/comware_1.snmprec
similarity index 100%
rename from tests/snmpsim/comware1.snmprec
rename to tests/snmpsim/comware_1.snmprec
diff --git a/tests/snmpsim/comware-h3c.snmprec b/tests/snmpsim/comware_h3c.snmprec
similarity index 100%
rename from tests/snmpsim/comware-h3c.snmprec
rename to tests/snmpsim/comware_h3c.snmprec
diff --git a/tests/snmpsim/ctcu1.snmprec b/tests/snmpsim/ctcu_1.snmprec
similarity index 100%
rename from tests/snmpsim/ctcu1.snmprec
rename to tests/snmpsim/ctcu_1.snmprec
diff --git a/tests/snmpsim/ctcu2.snmprec b/tests/snmpsim/ctcu_2.snmprec
similarity index 100%
rename from tests/snmpsim/ctcu2.snmprec
rename to tests/snmpsim/ctcu_2.snmprec
diff --git a/tests/snmpsim/ctcu3.snmprec b/tests/snmpsim/ctcu_3.snmprec
similarity index 100%
rename from tests/snmpsim/ctcu3.snmprec
rename to tests/snmpsim/ctcu_3.snmprec
diff --git a/tests/snmpsim/cyan-z33.snmprec b/tests/snmpsim/cyan_z33.snmprec
similarity index 100%
rename from tests/snmpsim/cyan-z33.snmprec
rename to tests/snmpsim/cyan_z33.snmprec
diff --git a/tests/snmpsim/dasan-nos1.snmprec b/tests/snmpsim/dasan-nos_1.snmprec
similarity index 100%
rename from tests/snmpsim/dasan-nos1.snmprec
rename to tests/snmpsim/dasan-nos_1.snmprec
diff --git a/tests/snmpsim/dasan-nos2.snmprec b/tests/snmpsim/dasan-nos_2.snmprec
similarity index 100%
rename from tests/snmpsim/dasan-nos2.snmprec
rename to tests/snmpsim/dasan-nos_2.snmprec
diff --git a/tests/snmpsim/dcn-software1.snmprec b/tests/snmpsim/dcn-software_1.snmprec
similarity index 100%
rename from tests/snmpsim/dcn-software1.snmprec
rename to tests/snmpsim/dcn-software_1.snmprec
diff --git a/tests/snmpsim/dell-laser-color.snmprec b/tests/snmpsim/dell-laser_color.snmprec
similarity index 100%
rename from tests/snmpsim/dell-laser-color.snmprec
rename to tests/snmpsim/dell-laser_color.snmprec
diff --git a/tests/snmpsim/dell-laser-mfp.snmprec b/tests/snmpsim/dell-laser_mfp.snmprec
similarity index 100%
rename from tests/snmpsim/dell-laser-mfp.snmprec
rename to tests/snmpsim/dell-laser_mfp.snmprec
diff --git a/tests/snmpsim/dlink-des.snmprec b/tests/snmpsim/dlink_des.snmprec
similarity index 100%
rename from tests/snmpsim/dlink-des.snmprec
rename to tests/snmpsim/dlink_des.snmprec
diff --git a/tests/snmpsim/dlink-des1.snmprec b/tests/snmpsim/dlink_des1.snmprec
similarity index 100%
rename from tests/snmpsim/dlink-des1.snmprec
rename to tests/snmpsim/dlink_des1.snmprec
diff --git a/tests/snmpsim/dlink-des2.snmprec b/tests/snmpsim/dlink_des2.snmprec
similarity index 100%
rename from tests/snmpsim/dlink-des2.snmprec
rename to tests/snmpsim/dlink_des2.snmprec
diff --git a/tests/snmpsim/dlink-dgs.snmprec b/tests/snmpsim/dlink_dgs.snmprec
similarity index 100%
rename from tests/snmpsim/dlink-dgs.snmprec
rename to tests/snmpsim/dlink_dgs.snmprec
diff --git a/tests/snmpsim/dlinkap1.snmprec b/tests/snmpsim/dlinkap_1.snmprec
similarity index 100%
rename from tests/snmpsim/dlinkap1.snmprec
rename to tests/snmpsim/dlinkap_1.snmprec
diff --git a/tests/snmpsim/dlinkap2.snmprec b/tests/snmpsim/dlinkap_2.snmprec
similarity index 100%
rename from tests/snmpsim/dlinkap2.snmprec
rename to tests/snmpsim/dlinkap_2.snmprec
diff --git a/tests/snmpsim/drac1.snmprec b/tests/snmpsim/drac_1.snmprec
similarity index 100%
rename from tests/snmpsim/drac1.snmprec
rename to tests/snmpsim/drac_1.snmprec
diff --git a/tests/snmpsim/drac2.snmprec b/tests/snmpsim/drac_2.snmprec
similarity index 100%
rename from tests/snmpsim/drac2.snmprec
rename to tests/snmpsim/drac_2.snmprec
diff --git a/tests/snmpsim/dsm-ds214.snmprec b/tests/snmpsim/dsm_ds214.snmprec
similarity index 100%
rename from tests/snmpsim/dsm-ds214.snmprec
rename to tests/snmpsim/dsm_ds214.snmprec
diff --git a/tests/snmpsim/dsm-ds916.snmprec b/tests/snmpsim/dsm_ds916.snmprec
similarity index 100%
rename from tests/snmpsim/dsm-ds916.snmprec
rename to tests/snmpsim/dsm_ds916.snmprec
diff --git a/tests/snmpsim/eaton-5p.snmprec b/tests/snmpsim/eaton-mgeups_5p.snmprec
similarity index 100%
rename from tests/snmpsim/eaton-5p.snmprec
rename to tests/snmpsim/eaton-mgeups_5p.snmprec
diff --git a/tests/snmpsim/eaton-5px.snmprec b/tests/snmpsim/eaton-mgeups_5px.snmprec
similarity index 100%
rename from tests/snmpsim/eaton-5px.snmprec
rename to tests/snmpsim/eaton-mgeups_5px.snmprec
diff --git a/tests/snmpsim/mgeups-comet.snmprec b/tests/snmpsim/eaton-mgeups_comet.snmprec
similarity index 100%
rename from tests/snmpsim/mgeups-comet.snmprec
rename to tests/snmpsim/eaton-mgeups_comet.snmprec
diff --git a/tests/snmpsim/mgeups-evolution.snmprec b/tests/snmpsim/eaton-mgeups_evolution.snmprec
similarity index 100%
rename from tests/snmpsim/mgeups-evolution.snmprec
rename to tests/snmpsim/eaton-mgeups_evolution.snmprec
diff --git a/tests/snmpsim/mgeups-ex2200.snmprec b/tests/snmpsim/eaton-mgeups_ex2200.snmprec
similarity index 100%
rename from tests/snmpsim/mgeups-ex2200.snmprec
rename to tests/snmpsim/eaton-mgeups_ex2200.snmprec
diff --git a/tests/snmpsim/mgeups-proxy.snmprec b/tests/snmpsim/eaton-mgeups_proxy.snmprec
similarity index 100%
rename from tests/snmpsim/mgeups-proxy.snmprec
rename to tests/snmpsim/eaton-mgeups_proxy.snmprec
diff --git a/tests/snmpsim/mgeups-pulsar.snmprec b/tests/snmpsim/eaton-mgeups_pulsar.snmprec
similarity index 100%
rename from tests/snmpsim/mgeups-pulsar.snmprec
rename to tests/snmpsim/eaton-mgeups_pulsar.snmprec
diff --git a/tests/snmpsim/eaton-powerxpert.snmprec b/tests/snmpsim/eatonups_powerxpert.snmprec
similarity index 100%
rename from tests/snmpsim/eaton-powerxpert.snmprec
rename to tests/snmpsim/eatonups_powerxpert.snmprec
diff --git a/tests/snmpsim/edgecos-ecs3510-52t.snmprec b/tests/snmpsim/edgecos_ecs3510-52t.snmprec
similarity index 100%
rename from tests/snmpsim/edgecos-ecs3510-52t.snmprec
rename to tests/snmpsim/edgecos_ecs3510-52t.snmprec
diff --git a/tests/snmpsim/edgecos-ecs4120-28f.snmprec b/tests/snmpsim/edgecos_ecs4120-28f.snmprec
similarity index 100%
rename from tests/snmpsim/edgecos-ecs4120-28f.snmprec
rename to tests/snmpsim/edgecos_ecs4120-28f.snmprec
diff --git a/tests/snmpsim/edgecos-ecs4210-28t.snmprec b/tests/snmpsim/edgecos_ecs4210-28t.snmprec
similarity index 100%
rename from tests/snmpsim/edgecos-ecs4210-28t.snmprec
rename to tests/snmpsim/edgecos_ecs4210-28t.snmprec
diff --git a/tests/snmpsim/edgecos-ecs4510-28f.snmprec b/tests/snmpsim/edgecos_ecs4510-28f.snmprec
similarity index 100%
rename from tests/snmpsim/edgecos-ecs4510-28f.snmprec
rename to tests/snmpsim/edgecos_ecs4510-28f.snmprec
diff --git a/tests/snmpsim/edgecos-ecs4510-52t.snmprec b/tests/snmpsim/edgecos_ecs4510-52t.snmprec
similarity index 100%
rename from tests/snmpsim/edgecos-ecs4510-52t.snmprec
rename to tests/snmpsim/edgecos_ecs4510-52t.snmprec
diff --git a/tests/snmpsim/edgecos-es3528m.snmprec b/tests/snmpsim/edgecos_es3528m.snmprec
similarity index 100%
rename from tests/snmpsim/edgecos-es3528m.snmprec
rename to tests/snmpsim/edgecos_es3528m.snmprec
diff --git a/tests/snmpsim/edgecos-es3528mv2.snmprec b/tests/snmpsim/edgecos_es3528mv2.snmprec
similarity index 100%
rename from tests/snmpsim/edgecos-es3528mv2.snmprec
rename to tests/snmpsim/edgecos_es3528mv2.snmprec
diff --git a/tests/snmpsim/edgeos-er.snmprec b/tests/snmpsim/edgeos_er.snmprec
similarity index 100%
rename from tests/snmpsim/edgeos-er.snmprec
rename to tests/snmpsim/edgeos_er.snmprec
diff --git a/tests/snmpsim/edgeos-erl.snmprec b/tests/snmpsim/edgeos_erl.snmprec
similarity index 100%
rename from tests/snmpsim/edgeos-erl.snmprec
rename to tests/snmpsim/edgeos_erl.snmprec
diff --git a/tests/snmpsim/edgeswitch-ep-s16.snmprec b/tests/snmpsim/edgeswitch_ep-s16.snmprec
similarity index 100%
rename from tests/snmpsim/edgeswitch-ep-s16.snmprec
rename to tests/snmpsim/edgeswitch_ep-s16.snmprec
diff --git a/tests/snmpsim/edgeswitch-es-24-250w.snmprec b/tests/snmpsim/edgeswitch_es-24-250w.snmprec
similarity index 100%
rename from tests/snmpsim/edgeswitch-es-24-250w.snmprec
rename to tests/snmpsim/edgeswitch_es-24-250w.snmprec
diff --git a/tests/snmpsim/unifiswitch.snmprec b/tests/snmpsim/edgeswitch_unifi-switch.snmprec
similarity index 100%
rename from tests/snmpsim/unifiswitch.snmprec
rename to tests/snmpsim/edgeswitch_unifi-switch.snmprec
diff --git a/tests/snmpsim/engenius1.snmprec b/tests/snmpsim/engenius_1.snmprec
similarity index 100%
rename from tests/snmpsim/engenius1.snmprec
rename to tests/snmpsim/engenius_1.snmprec
diff --git a/tests/snmpsim/engenius2.snmprec b/tests/snmpsim/engenius_2.snmprec
similarity index 100%
rename from tests/snmpsim/engenius2.snmprec
rename to tests/snmpsim/engenius_2.snmprec
diff --git a/tests/snmpsim/enterasys1.snmprec b/tests/snmpsim/enterasys_1.snmprec
similarity index 100%
rename from tests/snmpsim/enterasys1.snmprec
rename to tests/snmpsim/enterasys_1.snmprec
diff --git a/tests/snmpsim/fabos1.snmprec b/tests/snmpsim/fabos_1.snmprec
similarity index 100%
rename from tests/snmpsim/fabos1.snmprec
rename to tests/snmpsim/fabos_1.snmprec
diff --git a/tests/snmpsim/fabos2.snmprec b/tests/snmpsim/fabos_2.snmprec
similarity index 100%
rename from tests/snmpsim/fabos2.snmprec
rename to tests/snmpsim/fabos_2.snmprec
diff --git a/tests/snmpsim/fabos3.snmprec b/tests/snmpsim/fabos_3.snmprec
similarity index 100%
rename from tests/snmpsim/fabos3.snmprec
rename to tests/snmpsim/fabos_3.snmprec
diff --git a/tests/snmpsim/fiberhome-an5516-01.snmprec b/tests/snmpsim/fiberhome_an5516-01.snmprec
similarity index 100%
rename from tests/snmpsim/fiberhome-an5516-01.snmprec
rename to tests/snmpsim/fiberhome_an5516-01.snmprec
diff --git a/tests/snmpsim/fiberhome-an5516-06.snmprec b/tests/snmpsim/fiberhome_an5516-06.snmprec
similarity index 100%
rename from tests/snmpsim/fiberhome-an5516-06.snmprec
rename to tests/snmpsim/fiberhome_an5516-06.snmprec
diff --git a/tests/snmpsim/fireware-m400.snmprec b/tests/snmpsim/fireware_m400.snmprec
similarity index 100%
rename from tests/snmpsim/fireware-m400.snmprec
rename to tests/snmpsim/fireware_m400.snmprec
diff --git a/tests/snmpsim/fireware-xtm26w.snmprec b/tests/snmpsim/fireware_xtm26w.snmprec
similarity index 100%
rename from tests/snmpsim/fireware-xtm26w.snmprec
rename to tests/snmpsim/fireware_xtm26w.snmprec
diff --git a/tests/snmpsim/fortigate1.snmprec b/tests/snmpsim/fortigate_1.snmprec
similarity index 100%
rename from tests/snmpsim/fortigate1.snmprec
rename to tests/snmpsim/fortigate_1.snmprec
diff --git a/tests/snmpsim/freebsd-freenas.snmprec b/tests/snmpsim/freebsd_freenas.snmprec
similarity index 100%
rename from tests/snmpsim/freebsd-freenas.snmprec
rename to tests/snmpsim/freebsd_freenas.snmprec
diff --git a/tests/snmpsim/fujitsupyos-10gbe.snmprec b/tests/snmpsim/fujitsupyos_10gbe.snmprec
similarity index 100%
rename from tests/snmpsim/fujitsupyos-10gbe.snmprec
rename to tests/snmpsim/fujitsupyos_10gbe.snmprec
diff --git a/tests/snmpsim/gaia1.snmprec b/tests/snmpsim/gaia_1.snmprec
similarity index 100%
rename from tests/snmpsim/gaia1.snmprec
rename to tests/snmpsim/gaia_1.snmprec
diff --git a/tests/snmpsim/generex-ups1.snmprec b/tests/snmpsim/generex-ups_1.snmprec
similarity index 100%
rename from tests/snmpsim/generex-ups1.snmprec
rename to tests/snmpsim/generex-ups_1.snmprec
diff --git a/tests/snmpsim/generex-ups2.snmprec b/tests/snmpsim/generex-ups_2.snmprec
similarity index 100%
rename from tests/snmpsim/generex-ups2.snmprec
rename to tests/snmpsim/generex-ups_2.snmprec
diff --git a/tests/snmpsim/generex-ups3.snmprec b/tests/snmpsim/generex-ups_3.snmprec
similarity index 100%
rename from tests/snmpsim/generex-ups3.snmprec
rename to tests/snmpsim/generex-ups_3.snmprec
diff --git a/tests/snmpsim/ibmnos1.snmprec b/tests/snmpsim/ibmnos_1.snmprec
similarity index 100%
rename from tests/snmpsim/ibmnos1.snmprec
rename to tests/snmpsim/ibmnos_1.snmprec
diff --git a/tests/snmpsim/ibmnos-flex-lenovo-en4093r.snmprec b/tests/snmpsim/ibmnos_flex-lenovo-en4093r.snmprec
similarity index 100%
rename from tests/snmpsim/ibmnos-flex-lenovo-en4093r.snmprec
rename to tests/snmpsim/ibmnos_flex-lenovo-en4093r.snmprec
diff --git a/tests/snmpsim/ibmnos-flex.snmprec b/tests/snmpsim/ibmnos_flex.snmprec
similarity index 100%
rename from tests/snmpsim/ibmnos-flex.snmprec
rename to tests/snmpsim/ibmnos_flex.snmprec
diff --git a/tests/snmpsim/ies1.snmprec b/tests/snmpsim/ies_1.snmprec
similarity index 100%
rename from tests/snmpsim/ies1.snmprec
rename to tests/snmpsim/ies_1.snmprec
diff --git a/tests/snmpsim/ios1.snmprec b/tests/snmpsim/ios_1.snmprec
similarity index 100%
rename from tests/snmpsim/ios1.snmprec
rename to tests/snmpsim/ios_1.snmprec
diff --git a/tests/snmpsim/ios2.snmprec b/tests/snmpsim/ios_2.snmprec
similarity index 100%
rename from tests/snmpsim/ios2.snmprec
rename to tests/snmpsim/ios_2.snmprec
diff --git a/tests/snmpsim/ios-c3825.snmprec b/tests/snmpsim/ios_c3825.snmprec
similarity index 100%
rename from tests/snmpsim/ios-c3825.snmprec
rename to tests/snmpsim/ios_c3825.snmprec
diff --git a/tests/snmpsim/iosxe-asr1000.snmprec b/tests/snmpsim/iosxe_asr1000.snmprec
similarity index 100%
rename from tests/snmpsim/iosxe-asr1000.snmprec
rename to tests/snmpsim/iosxe_asr1000.snmprec
diff --git a/tests/snmpsim/iosxe-c4500.snmprec b/tests/snmpsim/iosxe_c4500.snmprec
similarity index 100%
rename from tests/snmpsim/iosxe-c4500.snmprec
rename to tests/snmpsim/iosxe_c4500.snmprec
diff --git a/tests/snmpsim/ipecs-ucp100.snmprec b/tests/snmpsim/ipecs_ucp100.snmprec
similarity index 100%
rename from tests/snmpsim/ipecs-ucp100.snmprec
rename to tests/snmpsim/ipecs_ucp100.snmprec
diff --git a/tests/snmpsim/ipecs-ucp600.snmprec b/tests/snmpsim/ipecs_ucp600.snmprec
similarity index 100%
rename from tests/snmpsim/ipecs-ucp600.snmprec
rename to tests/snmpsim/ipecs_ucp600.snmprec
diff --git a/tests/snmpsim/ise1.snmprec b/tests/snmpsim/ise_1.snmprec
similarity index 100%
rename from tests/snmpsim/ise1.snmprec
rename to tests/snmpsim/ise_1.snmprec
diff --git a/tests/snmpsim/ise2.snmprec b/tests/snmpsim/ise_2.snmprec
similarity index 100%
rename from tests/snmpsim/ise2.snmprec
rename to tests/snmpsim/ise_2.snmprec
diff --git a/tests/snmpsim/jetdirect1.snmprec b/tests/snmpsim/jetdirect_1.snmprec
similarity index 100%
rename from tests/snmpsim/jetdirect1.snmprec
rename to tests/snmpsim/jetdirect_1.snmprec
diff --git a/tests/snmpsim/jetdirect2.snmprec b/tests/snmpsim/jetdirect_2.snmprec
similarity index 100%
rename from tests/snmpsim/jetdirect2.snmprec
rename to tests/snmpsim/jetdirect_2.snmprec
diff --git a/tests/snmpsim/junos1.snmprec b/tests/snmpsim/junos_1.snmprec
similarity index 100%
rename from tests/snmpsim/junos1.snmprec
rename to tests/snmpsim/junos_1.snmprec
diff --git a/tests/snmpsim/lcos1.snmprec b/tests/snmpsim/lcos_1.snmprec
similarity index 100%
rename from tests/snmpsim/lcos1.snmprec
rename to tests/snmpsim/lcos_1.snmprec
diff --git a/tests/snmpsim/linksys-lgs308p.snmprec b/tests/snmpsim/linksys-ss_lgs308p.snmprec
similarity index 100%
rename from tests/snmpsim/linksys-lgs308p.snmprec
rename to tests/snmpsim/linksys-ss_lgs308p.snmprec
diff --git a/tests/snmpsim/linux1.snmprec b/tests/snmpsim/linux_1.snmprec
similarity index 100%
rename from tests/snmpsim/linux1.snmprec
rename to tests/snmpsim/linux_1.snmprec
diff --git a/tests/snmpsim/macosx-sierra.snmprec b/tests/snmpsim/macosx_sierra.snmprec
similarity index 100%
rename from tests/snmpsim/macosx-sierra.snmprec
rename to tests/snmpsim/macosx_sierra.snmprec
diff --git a/tests/snmpsim/mellanox-i5035.snmprec b/tests/snmpsim/mellanox_i5035.snmprec
similarity index 100%
rename from tests/snmpsim/mellanox-i5035.snmprec
rename to tests/snmpsim/mellanox_i5035.snmprec
diff --git a/tests/snmpsim/netbotz-2014.snmprec b/tests/snmpsim/netbotz_2014.snmprec
similarity index 100%
rename from tests/snmpsim/netbotz-2014.snmprec
rename to tests/snmpsim/netbotz_2014.snmprec
diff --git a/tests/snmpsim/netbotz-2016.snmprec b/tests/snmpsim/netbotz_2016.snmprec
similarity index 100%
rename from tests/snmpsim/netbotz-2016.snmprec
rename to tests/snmpsim/netbotz_2016.snmprec
diff --git a/tests/snmpsim/netbotz-2017.snmprec b/tests/snmpsim/netbotz_2017.snmprec
similarity index 100%
rename from tests/snmpsim/netbotz-2017.snmprec
rename to tests/snmpsim/netbotz_2017.snmprec
diff --git a/tests/snmpsim/netgear1.snmprec b/tests/snmpsim/netgear_1.snmprec
similarity index 100%
rename from tests/snmpsim/netgear1.snmprec
rename to tests/snmpsim/netgear_1.snmprec
diff --git a/tests/snmpsim/netgear2.snmprec b/tests/snmpsim/netgear_2.snmprec
similarity index 100%
rename from tests/snmpsim/netgear2.snmprec
rename to tests/snmpsim/netgear_2.snmprec
diff --git a/tests/snmpsim/netmanplus1.snmprec b/tests/snmpsim/netmanplus_1.snmprec
similarity index 100%
rename from tests/snmpsim/netmanplus1.snmprec
rename to tests/snmpsim/netmanplus_1.snmprec
diff --git a/tests/snmpsim/netonix-wispswitch.snmprec b/tests/snmpsim/netonix_wispswitch.snmprec
similarity index 100%
rename from tests/snmpsim/netonix-wispswitch.snmprec
rename to tests/snmpsim/netonix_wispswitch.snmprec
diff --git a/tests/snmpsim/netscaler-sdx.snmprec b/tests/snmpsim/netscaler_sdx.snmprec
similarity index 100%
rename from tests/snmpsim/netscaler-sdx.snmprec
rename to tests/snmpsim/netscaler_sdx.snmprec
diff --git a/tests/snmpsim/nios-ipam.snmprec b/tests/snmpsim/nios_ipam.snmprec
similarity index 100%
rename from tests/snmpsim/nios-ipam.snmprec
rename to tests/snmpsim/nios_ipam.snmprec
diff --git a/tests/snmpsim/nitro1.snmprec b/tests/snmpsim/nitro_1.snmprec
similarity index 100%
rename from tests/snmpsim/nitro1.snmprec
rename to tests/snmpsim/nitro_1.snmprec
diff --git a/tests/snmpsim/nitro2.snmprec b/tests/snmpsim/nitro_2.snmprec
similarity index 100%
rename from tests/snmpsim/nitro2.snmprec
rename to tests/snmpsim/nitro_2.snmprec
diff --git a/tests/snmpsim/nitro3.snmprec b/tests/snmpsim/nitro_3.snmprec
similarity index 100%
rename from tests/snmpsim/nitro3.snmprec
rename to tests/snmpsim/nitro_3.snmprec
diff --git a/tests/snmpsim/nos1.snmprec b/tests/snmpsim/nos_1.snmprec
similarity index 100%
rename from tests/snmpsim/nos1.snmprec
rename to tests/snmpsim/nos_1.snmprec
diff --git a/tests/snmpsim/nos2.snmprec b/tests/snmpsim/nos_2.snmprec
similarity index 100%
rename from tests/snmpsim/nos2.snmprec
rename to tests/snmpsim/nos_2.snmprec
diff --git a/tests/snmpsim/onefs-v8.snmprec b/tests/snmpsim/onefs_v8.snmprec
similarity index 100%
rename from tests/snmpsim/onefs-v8.snmprec
rename to tests/snmpsim/onefs_v8.snmprec
diff --git a/tests/snmpsim/openbsd1.snmprec b/tests/snmpsim/openbsd_1.snmprec
similarity index 100%
rename from tests/snmpsim/openbsd1.snmprec
rename to tests/snmpsim/openbsd_1.snmprec
diff --git a/tests/snmpsim/opengear1.snmprec b/tests/snmpsim/opengear_1.snmprec
similarity index 100%
rename from tests/snmpsim/opengear1.snmprec
rename to tests/snmpsim/opengear_1.snmprec
diff --git a/tests/snmpsim/papouch-tme1.snmprec b/tests/snmpsim/papouch-tme_1.snmprec
similarity index 100%
rename from tests/snmpsim/papouch-tme1.snmprec
rename to tests/snmpsim/papouch-tme_1.snmprec
diff --git a/tests/snmpsim/planetos1.snmprec b/tests/snmpsim/planetos_1.snmprec
similarity index 100%
rename from tests/snmpsim/planetos1.snmprec
rename to tests/snmpsim/planetos_1.snmprec
diff --git a/tests/snmpsim/planetos-gs-5220-16s8c.snmprec b/tests/snmpsim/planetos_gs-5220-16s8c.snmprec
similarity index 100%
rename from tests/snmpsim/planetos-gs-5220-16s8c.snmprec
rename to tests/snmpsim/planetos_gs-5220-16s8c.snmprec
diff --git a/tests/snmpsim/planetos-sgsw-24240.snmprec b/tests/snmpsim/planetos_sgsw-24240.snmprec
similarity index 100%
rename from tests/snmpsim/planetos-sgsw-24240.snmprec
rename to tests/snmpsim/planetos_sgsw-24240.snmprec
diff --git a/tests/snmpsim/poweralert1.snmprec b/tests/snmpsim/poweralert_1.snmprec
similarity index 100%
rename from tests/snmpsim/poweralert1.snmprec
rename to tests/snmpsim/poweralert_1.snmprec
diff --git a/tests/snmpsim/powerconnect1.snmprec b/tests/snmpsim/powerconnect_1.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect1.snmprec
rename to tests/snmpsim/powerconnect_1.snmprec
diff --git a/tests/snmpsim/powerconnect10.snmprec b/tests/snmpsim/powerconnect_10.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect10.snmprec
rename to tests/snmpsim/powerconnect_10.snmprec
diff --git a/tests/snmpsim/powerconnect11.snmprec b/tests/snmpsim/powerconnect_11.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect11.snmprec
rename to tests/snmpsim/powerconnect_11.snmprec
diff --git a/tests/snmpsim/powerconnect12.snmprec b/tests/snmpsim/powerconnect_12.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect12.snmprec
rename to tests/snmpsim/powerconnect_12.snmprec
diff --git a/tests/snmpsim/powerconnect13.snmprec b/tests/snmpsim/powerconnect_13.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect13.snmprec
rename to tests/snmpsim/powerconnect_13.snmprec
diff --git a/tests/snmpsim/powerconnect2.snmprec b/tests/snmpsim/powerconnect_2.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect2.snmprec
rename to tests/snmpsim/powerconnect_2.snmprec
diff --git a/tests/snmpsim/powerconnect3.snmprec b/tests/snmpsim/powerconnect_3.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect3.snmprec
rename to tests/snmpsim/powerconnect_3.snmprec
diff --git a/tests/snmpsim/powerconnect-3004.snmprec b/tests/snmpsim/powerconnect_3004.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect-3004.snmprec
rename to tests/snmpsim/powerconnect_3004.snmprec
diff --git a/tests/snmpsim/powerconnect-3011.snmprec b/tests/snmpsim/powerconnect_3011.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect-3011.snmprec
rename to tests/snmpsim/powerconnect_3011.snmprec
diff --git a/tests/snmpsim/powerconnect-3019.snmprec b/tests/snmpsim/powerconnect_3019.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect-3019.snmprec
rename to tests/snmpsim/powerconnect_3019.snmprec
diff --git a/tests/snmpsim/powerconnect-3031.snmprec b/tests/snmpsim/powerconnect_3031.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect-3031.snmprec
rename to tests/snmpsim/powerconnect_3031.snmprec
diff --git a/tests/snmpsim/powerconnect-3041.snmprec b/tests/snmpsim/powerconnect_3041.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect-3041.snmprec
rename to tests/snmpsim/powerconnect_3041.snmprec
diff --git a/tests/snmpsim/powerconnect4.snmprec b/tests/snmpsim/powerconnect_4.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect4.snmprec
rename to tests/snmpsim/powerconnect_4.snmprec
diff --git a/tests/snmpsim/powerconnect5.snmprec b/tests/snmpsim/powerconnect_5.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect5.snmprec
rename to tests/snmpsim/powerconnect_5.snmprec
diff --git a/tests/snmpsim/powerconnect6.snmprec b/tests/snmpsim/powerconnect_6.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect6.snmprec
rename to tests/snmpsim/powerconnect_6.snmprec
diff --git a/tests/snmpsim/powerconnect7.snmprec b/tests/snmpsim/powerconnect_7.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect7.snmprec
rename to tests/snmpsim/powerconnect_7.snmprec
diff --git a/tests/snmpsim/powerconnect8.snmprec b/tests/snmpsim/powerconnect_8.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect8.snmprec
rename to tests/snmpsim/powerconnect_8.snmprec
diff --git a/tests/snmpsim/powerconnect9.snmprec b/tests/snmpsim/powerconnect_9.snmprec
similarity index 100%
rename from tests/snmpsim/powerconnect9.snmprec
rename to tests/snmpsim/powerconnect_9.snmprec
diff --git a/tests/snmpsim/procurve-131.snmprec b/tests/snmpsim/procurve_131.snmprec
similarity index 100%
rename from tests/snmpsim/procurve-131.snmprec
rename to tests/snmpsim/procurve_131.snmprec
diff --git a/tests/snmpsim/procurve-151.snmprec b/tests/snmpsim/procurve_151.snmprec
similarity index 100%
rename from tests/snmpsim/procurve-151.snmprec
rename to tests/snmpsim/procurve_151.snmprec
diff --git a/tests/snmpsim/procurve-167-hp.snmprec b/tests/snmpsim/procurve_167-hp.snmprec
similarity index 100%
rename from tests/snmpsim/procurve-167-hp.snmprec
rename to tests/snmpsim/procurve_167-hp.snmprec
diff --git a/tests/snmpsim/procurve-167-hpe.snmprec b/tests/snmpsim/procurve_167-hpe.snmprec
similarity index 100%
rename from tests/snmpsim/procurve-167-hpe.snmprec
rename to tests/snmpsim/procurve_167-hpe.snmprec
diff --git a/tests/snmpsim/procurve-50-procurve.snmprec b/tests/snmpsim/procurve_50-procurve.snmprec
similarity index 100%
rename from tests/snmpsim/procurve-50-procurve.snmprec
rename to tests/snmpsim/procurve_50-procurve.snmprec
diff --git a/tests/snmpsim/procurve-66.snmprec b/tests/snmpsim/procurve_66.snmprec
similarity index 100%
rename from tests/snmpsim/procurve-66.snmprec
rename to tests/snmpsim/procurve_66.snmprec
diff --git a/tests/snmpsim/pulse-mag2600.snmprec b/tests/snmpsim/pulse_mag2600.snmprec
similarity index 100%
rename from tests/snmpsim/pulse-mag2600.snmprec
rename to tests/snmpsim/pulse_mag2600.snmprec
diff --git a/tests/snmpsim/pulse-sa.snmprec b/tests/snmpsim/pulse_sa.snmprec
similarity index 100%
rename from tests/snmpsim/pulse-sa.snmprec
rename to tests/snmpsim/pulse_sa.snmprec
diff --git a/tests/snmpsim/pulse-sa2500.snmprec b/tests/snmpsim/pulse_sa2500.snmprec
similarity index 100%
rename from tests/snmpsim/pulse-sa2500.snmprec
rename to tests/snmpsim/pulse_sa2500.snmprec
diff --git a/tests/snmpsim/pulse-sa6500.snmprec b/tests/snmpsim/pulse_sa6500.snmprec
similarity index 100%
rename from tests/snmpsim/pulse-sa6500.snmprec
rename to tests/snmpsim/pulse_sa6500.snmprec
diff --git a/tests/snmpsim/pulse-vaspe.snmprec b/tests/snmpsim/pulse_vaspe.snmprec
similarity index 100%
rename from tests/snmpsim/pulse-vaspe.snmprec
rename to tests/snmpsim/pulse_vaspe.snmprec
diff --git a/tests/snmpsim/qnap-ts431.snmprec b/tests/snmpsim/qnap_ts431.snmprec
similarity index 100%
rename from tests/snmpsim/qnap-ts431.snmprec
rename to tests/snmpsim/qnap_ts431.snmprec
diff --git a/tests/snmpsim/quanta1.snmprec b/tests/snmpsim/quanta_1.snmprec
similarity index 100%
rename from tests/snmpsim/quanta1.snmprec
rename to tests/snmpsim/quanta_1.snmprec
diff --git a/tests/snmpsim/quanta2.snmprec b/tests/snmpsim/quanta_2.snmprec
similarity index 100%
rename from tests/snmpsim/quanta2.snmprec
rename to tests/snmpsim/quanta_2.snmprec
diff --git a/tests/snmpsim/quanta3.snmprec b/tests/snmpsim/quanta_3.snmprec
similarity index 100%
rename from tests/snmpsim/quanta3.snmprec
rename to tests/snmpsim/quanta_3.snmprec
diff --git a/tests/snmpsim/quanta-lb9.snmprec b/tests/snmpsim/quanta_lb9.snmprec
similarity index 100%
rename from tests/snmpsim/quanta-lb9.snmprec
rename to tests/snmpsim/quanta_lb9.snmprec
diff --git a/tests/snmpsim/raisecom-ros.snmprec b/tests/snmpsim/raisecom_ros.snmprec
similarity index 100%
rename from tests/snmpsim/raisecom-ros.snmprec
rename to tests/snmpsim/raisecom_ros.snmprec
diff --git a/tests/snmpsim/raritan-px2.snmprec b/tests/snmpsim/raritan_px2.snmprec
similarity index 100%
rename from tests/snmpsim/raritan-px2.snmprec
rename to tests/snmpsim/raritan_px2.snmprec
diff --git a/tests/snmpsim/ricoh-aficio.snmprec b/tests/snmpsim/ricoh_aficio.snmprec
similarity index 100%
rename from tests/snmpsim/ricoh-aficio.snmprec
rename to tests/snmpsim/ricoh_aficio.snmprec
diff --git a/tests/snmpsim/routeros1.snmprec b/tests/snmpsim/routeros_1.snmprec
similarity index 100%
rename from tests/snmpsim/routeros1.snmprec
rename to tests/snmpsim/routeros_1.snmprec
diff --git a/tests/snmpsim/samsungprinter-c.snmprec b/tests/snmpsim/samsungprinter_c.snmprec
similarity index 100%
rename from tests/snmpsim/samsungprinter-c.snmprec
rename to tests/snmpsim/samsungprinter_c.snmprec
diff --git a/tests/snmpsim/samsungprinter-clx.snmprec b/tests/snmpsim/samsungprinter_clx.snmprec
similarity index 100%
rename from tests/snmpsim/samsungprinter-clx.snmprec
rename to tests/snmpsim/samsungprinter_clx.snmprec
diff --git a/tests/snmpsim/samsungprinter-ml.snmprec b/tests/snmpsim/samsungprinter_ml.snmprec
similarity index 100%
rename from tests/snmpsim/samsungprinter-ml.snmprec
rename to tests/snmpsim/samsungprinter_ml.snmprec
diff --git a/tests/snmpsim/samsungprinter-s.snmprec b/tests/snmpsim/samsungprinter_s.snmprec
similarity index 100%
rename from tests/snmpsim/samsungprinter-s.snmprec
rename to tests/snmpsim/samsungprinter_s.snmprec
diff --git a/tests/snmpsim/samsungprinter-scx.snmprec b/tests/snmpsim/samsungprinter_scx.snmprec
similarity index 100%
rename from tests/snmpsim/samsungprinter-scx.snmprec
rename to tests/snmpsim/samsungprinter_scx.snmprec
diff --git a/tests/snmpsim/screenos1.snmprec b/tests/snmpsim/screenos_1.snmprec
similarity index 100%
rename from tests/snmpsim/screenos1.snmprec
rename to tests/snmpsim/screenos_1.snmprec
diff --git a/tests/snmpsim/sentry3-smart.snmprec b/tests/snmpsim/sentry3_smart.snmprec
similarity index 100%
rename from tests/snmpsim/sentry3-smart.snmprec
rename to tests/snmpsim/sentry3_smart.snmprec
diff --git a/tests/snmpsim/sentry3-switched.snmprec b/tests/snmpsim/sentry3_switched.snmprec
similarity index 100%
rename from tests/snmpsim/sentry3-switched.snmprec
rename to tests/snmpsim/sentry3_switched.snmprec
diff --git a/tests/snmpsim/sentry4-smart.snmprec b/tests/snmpsim/sentry4_smart.snmprec
similarity index 100%
rename from tests/snmpsim/sentry4-smart.snmprec
rename to tests/snmpsim/sentry4_smart.snmprec
diff --git a/tests/snmpsim/sentry4-switched.snmprec b/tests/snmpsim/sentry4_switched.snmprec
similarity index 100%
rename from tests/snmpsim/sentry4-switched.snmprec
rename to tests/snmpsim/sentry4_switched.snmprec
diff --git a/tests/snmpsim/sharp-mx2614n.snmprec b/tests/snmpsim/sharp_mx2614n.snmprec
similarity index 100%
rename from tests/snmpsim/sharp-mx2614n.snmprec
rename to tests/snmpsim/sharp_mx2614n.snmprec
diff --git a/tests/snmpsim/sharp-mx3140n.snmprec b/tests/snmpsim/sharp_mx3140n.snmprec
similarity index 100%
rename from tests/snmpsim/sharp-mx3140n.snmprec
rename to tests/snmpsim/sharp_mx3140n.snmprec
diff --git a/tests/snmpsim/sharp-mxc301w.snmprec b/tests/snmpsim/sharp_mxc301w.snmprec
similarity index 100%
rename from tests/snmpsim/sharp-mxc301w.snmprec
rename to tests/snmpsim/sharp_mxc301w.snmprec
diff --git a/tests/snmpsim/solaris1.snmprec b/tests/snmpsim/solaris_1.snmprec
similarity index 100%
rename from tests/snmpsim/solaris1.snmprec
rename to tests/snmpsim/solaris_1.snmprec
diff --git a/tests/snmpsim/sonus-sbc1.snmprec b/tests/snmpsim/sonus-sbc_1.snmprec
similarity index 100%
rename from tests/snmpsim/sonus-sbc1.snmprec
rename to tests/snmpsim/sonus-sbc_1.snmprec
diff --git a/tests/snmpsim/sonus-sbc1500.snmprec b/tests/snmpsim/sonus-sbc_1500.snmprec
similarity index 100%
rename from tests/snmpsim/sonus-sbc1500.snmprec
rename to tests/snmpsim/sonus-sbc_1500.snmprec
diff --git a/tests/snmpsim/sophos1.snmprec b/tests/snmpsim/sophos_1.snmprec
similarity index 100%
rename from tests/snmpsim/sophos1.snmprec
rename to tests/snmpsim/sophos_1.snmprec
diff --git a/tests/snmpsim/speedtouch-st5000.snmprec b/tests/snmpsim/speedtouch_st5000.snmprec
similarity index 100%
rename from tests/snmpsim/speedtouch-st5000.snmprec
rename to tests/snmpsim/speedtouch_st5000.snmprec
diff --git a/tests/snmpsim/speedtouch-tg585.snmprec b/tests/snmpsim/speedtouch_tg585.snmprec
similarity index 100%
rename from tests/snmpsim/speedtouch-tg585.snmprec
rename to tests/snmpsim/speedtouch_tg585.snmprec
diff --git a/tests/snmpsim/supermicro-switch-sbm.snmprec b/tests/snmpsim/supermicro-switch_sbm.snmprec
similarity index 100%
rename from tests/snmpsim/supermicro-switch-sbm.snmprec
rename to tests/snmpsim/supermicro-switch_sbm.snmprec
diff --git a/tests/snmpsim/supermicro-switch-sse.snmprec b/tests/snmpsim/supermicro-switch_sse.snmprec
similarity index 100%
rename from tests/snmpsim/supermicro-switch-sse.snmprec
rename to tests/snmpsim/supermicro-switch_sse.snmprec
diff --git a/tests/snmpsim/timos1.snmprec b/tests/snmpsim/timos_1.snmprec
similarity index 100%
rename from tests/snmpsim/timos1.snmprec
rename to tests/snmpsim/timos_1.snmprec
diff --git a/tests/snmpsim/timos10.snmprec b/tests/snmpsim/timos_10.snmprec
similarity index 100%
rename from tests/snmpsim/timos10.snmprec
rename to tests/snmpsim/timos_10.snmprec
diff --git a/tests/snmpsim/timos2.snmprec b/tests/snmpsim/timos_2.snmprec
similarity index 100%
rename from tests/snmpsim/timos2.snmprec
rename to tests/snmpsim/timos_2.snmprec
diff --git a/tests/snmpsim/timos3.snmprec b/tests/snmpsim/timos_3.snmprec
similarity index 100%
rename from tests/snmpsim/timos3.snmprec
rename to tests/snmpsim/timos_3.snmprec
diff --git a/tests/snmpsim/timos4.snmprec b/tests/snmpsim/timos_4.snmprec
similarity index 100%
rename from tests/snmpsim/timos4.snmprec
rename to tests/snmpsim/timos_4.snmprec
diff --git a/tests/snmpsim/timos5.snmprec b/tests/snmpsim/timos_5.snmprec
similarity index 100%
rename from tests/snmpsim/timos5.snmprec
rename to tests/snmpsim/timos_5.snmprec
diff --git a/tests/snmpsim/timos6.snmprec b/tests/snmpsim/timos_6.snmprec
similarity index 100%
rename from tests/snmpsim/timos6.snmprec
rename to tests/snmpsim/timos_6.snmprec
diff --git a/tests/snmpsim/timos7.snmprec b/tests/snmpsim/timos_7.snmprec
similarity index 100%
rename from tests/snmpsim/timos7.snmprec
rename to tests/snmpsim/timos_7.snmprec
diff --git a/tests/snmpsim/timos8.snmprec b/tests/snmpsim/timos_8.snmprec
similarity index 100%
rename from tests/snmpsim/timos8.snmprec
rename to tests/snmpsim/timos_8.snmprec
diff --git a/tests/snmpsim/timos9.snmprec b/tests/snmpsim/timos_9.snmprec
similarity index 100%
rename from tests/snmpsim/timos9.snmprec
rename to tests/snmpsim/timos_9.snmprec
diff --git a/tests/snmpsim/toshiba-tec-ev4.snmprec b/tests/snmpsim/toshiba-tec_ev4.snmprec
similarity index 100%
rename from tests/snmpsim/toshiba-tec-ev4.snmprec
rename to tests/snmpsim/toshiba-tec_ev4.snmprec
diff --git a/tests/snmpsim/toshiba-tec-fv4.snmprec b/tests/snmpsim/toshiba-tec_fv4.snmprec
similarity index 100%
rename from tests/snmpsim/toshiba-tec-fv4.snmprec
rename to tests/snmpsim/toshiba-tec_fv4.snmprec
diff --git a/tests/snmpsim/toshiba-tec-sx5t.snmprec b/tests/snmpsim/toshiba-tec_sx5t.snmprec
similarity index 100%
rename from tests/snmpsim/toshiba-tec-sx5t.snmprec
rename to tests/snmpsim/toshiba-tec_sx5t.snmprec
diff --git a/tests/snmpsim/tplink1.snmprec b/tests/snmpsim/tplink_1.snmprec
similarity index 100%
rename from tests/snmpsim/tplink1.snmprec
rename to tests/snmpsim/tplink_1.snmprec
diff --git a/tests/snmpsim/tplink-t1600g-28ts.snmprec b/tests/snmpsim/tplink_t1600g-28ts.snmprec
similarity index 100%
rename from tests/snmpsim/tplink-t1600g-28ts.snmprec
rename to tests/snmpsim/tplink_t1600g-28ts.snmprec
diff --git a/tests/snmpsim/vmware-esx.snmprec b/tests/snmpsim/vmware_esx.snmprec
similarity index 100%
rename from tests/snmpsim/vmware-esx.snmprec
rename to tests/snmpsim/vmware_esx.snmprec
diff --git a/tests/snmpsim/vmware-vcsa.snmprec b/tests/snmpsim/vmware_vcsa.snmprec
similarity index 100%
rename from tests/snmpsim/vmware-vcsa.snmprec
rename to tests/snmpsim/vmware_vcsa.snmprec
diff --git a/tests/snmpsim/vrp1.snmprec b/tests/snmpsim/vrp_1.snmprec
similarity index 100%
rename from tests/snmpsim/vrp1.snmprec
rename to tests/snmpsim/vrp_1.snmprec
diff --git a/tests/snmpsim/vrp2.snmprec b/tests/snmpsim/vrp_2.snmprec
similarity index 100%
rename from tests/snmpsim/vrp2.snmprec
rename to tests/snmpsim/vrp_2.snmprec
diff --git a/tests/snmpsim/vrp3.snmprec b/tests/snmpsim/vrp_3.snmprec
similarity index 100%
rename from tests/snmpsim/vrp3.snmprec
rename to tests/snmpsim/vrp_3.snmprec
diff --git a/tests/snmpsim/vrp4.snmprec b/tests/snmpsim/vrp_4.snmprec
similarity index 100%
rename from tests/snmpsim/vrp4.snmprec
rename to tests/snmpsim/vrp_4.snmprec
diff --git a/tests/snmpsim/vyos-vyatta.snmprec b/tests/snmpsim/vyos_vyatta.snmprec
similarity index 100%
rename from tests/snmpsim/vyos-vyatta.snmprec
rename to tests/snmpsim/vyos_vyatta.snmprec
diff --git a/tests/snmpsim/windows1.snmprec b/tests/snmpsim/windows_1.snmprec
similarity index 100%
rename from tests/snmpsim/windows1.snmprec
rename to tests/snmpsim/windows_1.snmprec
diff --git a/tests/snmpsim/wxgoos1.snmprec b/tests/snmpsim/wxgoos_1.snmprec
similarity index 100%
rename from tests/snmpsim/wxgoos1.snmprec
rename to tests/snmpsim/wxgoos_1.snmprec
diff --git a/tests/snmpsim/xerox-color.snmprec b/tests/snmpsim/xerox_color.snmprec
similarity index 100%
rename from tests/snmpsim/xerox-color.snmprec
rename to tests/snmpsim/xerox_color.snmprec
diff --git a/tests/snmpsim/xerox-docuprint.snmprec b/tests/snmpsim/xerox_docuprint.snmprec
similarity index 100%
rename from tests/snmpsim/xerox-docuprint.snmprec
rename to tests/snmpsim/xerox_docuprint.snmprec
diff --git a/tests/snmpsim/xerox-phaser.snmprec b/tests/snmpsim/xerox_phaser.snmprec
similarity index 100%
rename from tests/snmpsim/xerox-phaser.snmprec
rename to tests/snmpsim/xerox_phaser.snmprec
diff --git a/tests/snmpsim/xerox-workcentre.snmprec b/tests/snmpsim/xerox_workcentre.snmprec
similarity index 100%
rename from tests/snmpsim/xerox-workcentre.snmprec
rename to tests/snmpsim/xerox_workcentre.snmprec
diff --git a/tests/snmpsim/zebra1.snmprec b/tests/snmpsim/zebra_1.snmprec
similarity index 100%
rename from tests/snmpsim/zebra1.snmprec
rename to tests/snmpsim/zebra_1.snmprec
diff --git a/tests/snmpsim/zynos-es.snmprec b/tests/snmpsim/zynos_es.snmprec
similarity index 100%
rename from tests/snmpsim/zynos-es.snmprec
rename to tests/snmpsim/zynos_es.snmprec
diff --git a/tests/snmpsim/zynos-gs.snmprec b/tests/snmpsim/zynos_gs.snmprec
similarity index 100%
rename from tests/snmpsim/zynos-gs.snmprec
rename to tests/snmpsim/zynos_gs.snmprec
diff --git a/tests/snmpsim/zynos-mes3528.snmprec b/tests/snmpsim/zynos_mes3528.snmprec
similarity index 100%
rename from tests/snmpsim/zynos-mes3528.snmprec
rename to tests/snmpsim/zynos_mes3528.snmprec
diff --git a/tests/snmpsim/zynos-xs.snmprec b/tests/snmpsim/zynos_xs.snmprec
similarity index 100%
rename from tests/snmpsim/zynos-xs.snmprec
rename to tests/snmpsim/zynos_xs.snmprec
diff --git a/tests/snmpsim/zywall1.snmprec b/tests/snmpsim/zywall_1.snmprec
similarity index 100%
rename from tests/snmpsim/zywall1.snmprec
rename to tests/snmpsim/zywall_1.snmprec
diff --git a/tests/snmpsim/zywall2.snmprec b/tests/snmpsim/zywall_2.snmprec
similarity index 100%
rename from tests/snmpsim/zywall2.snmprec
rename to tests/snmpsim/zywall_2.snmprec
diff --git a/tests/snmpsim/zyxelnwa1.snmprec b/tests/snmpsim/zyxelnwa_1.snmprec
similarity index 100%
rename from tests/snmpsim/zyxelnwa1.snmprec
rename to tests/snmpsim/zyxelnwa_1.snmprec