diff --git a/.travis.yml b/.travis.yml
index 86c04a8549..debda600d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: required
 language: php
 matrix:
   fast_finish: true
@@ -24,17 +25,31 @@ matrix:
   - php: hhvm
 
 cache:
-  directories:
+  - pip
+  - directories:
     - vendor
     - $HOME/.composer/cache
+    - $HOME/.snmpsim-cache
+
+
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y snmp
+
+install:
+  - composer install --prefer-dist --no-interaction
+  - pip install --user snmpsim
 
 before_script:
-  - composer install --prefer-dist --no-interaction
+  - python2 $HOME/.local/bin/snmpsimd.py --data-dir=$TRAVIS_BUILD_DIR/tests/snmpsim --agent-udpv4-endpoint=127.0.0.1:11161 --logging-method=file:/tmp/snmpsimd.log  --cache-dir=$HOME/.snmpsim-cache --daemon --pid-file=/tmp/snmpsimd.pid
 
 after_success:
   - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test $EXECUTE_BUILD_DOCS == "true" && bash scripts/deploy-docs.sh
 
+after_failure:
+  - cat /tmp/snmpsimd.log
+
 script:
-  - php scripts/pre-commit.php -p -l
-  - php scripts/pre-commit.php -p -s
-  - phpunit
+  - php scripts/pre-commit.php -l
+  - php scripts/pre-commit.php -s
+  - SNMPSIM=1 phpunit --stop-on-failure
diff --git a/doc/Support/Support-New-OS.md b/doc/Support/Support-New-OS.md
index 8cca183dfd..357926a426 100644
--- a/doc/Support/Support-New-OS.md
+++ b/doc/Support/Support-New-OS.md
@@ -423,32 +423,54 @@ We have a testing unit for new OS', please ensure you add a test for any new OS'
 The OS test unit file is located `tests/OSDiscoveryTest.php`. An example of this is as follows:
 
 ```php
-    public function testZxr10()
+    public function testNios()
     {
-        $this->checkOS('zxr10', 'ZTE Ethernet Switch  ZXR10 5250-52TM-H, Version: V2.05.11B23');
+        $this->checkOS('nios');
+        $this->checkOS('nios', 'nios-ipam');
     }
 ```
 
-This test looks for the sysDescr of `ZTE Ethernet Switch  ZXR10 5250-52TM-H, Version: V2.05.11B23` and if it matches 
-the `zxr10` OS discovery file then the check will pass.
 
-A slightly more complicated test would be:
-
-```php
-    public function testAiros()
-    {
-        $this->checkOS('airos', 'Linux', '.1.3.6.1.4.1.10002.1');
-        $this->checkOS('airos', 'Linux', '.1.3.6.1.4.1.41112.1.4');
-
-        $mockSnmp = array(
-            'dot11manufacturerName.5' => 'Ubiquiti',
-        );
-        $this->checkOS('airos', 'Linux', '', $mockSnmp);
-    }
+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 nios as the example again this would look like:
+```
+1.3.6.1.2.1.1.1.0|4|Linux 3.14.25 #1 SMP Thu Jun 16 18:19:37 EDT 2016 x86_64
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.7779.1.1402
 ```
 
-The first two `$this->checkOS` calls pass on both a `sysDescr` value (`Linux`) and a `sysObjectID`.
+During testing LibreNMS will use any info in the snmprec file for snmp calls.  This one provides 
+sysDescr (`.1.3.6.1.2.1.1.1.0`, 4 = Octet String) and sysObjectID (`.1.3.6.1.2.1.1.2.0`, 6 = Object Identifier),
+ which is the minimum that should be provided for new snmprec files.
 
-The third call uses another snmp response (although fake) which the specific OS discovery for `airos` relies on.
+To look up the numeric OID and type of an string OID with snmptranslate:
+```bash
+snmptranslate -On -Td SNMPv2-MIB::sysDescr.0
+```
 
-You can run `scripts/pre-commit.php -u` to run the unit tests to check your code.
+Common OIDs used in discovery:
+
+| String OID                          | Numeric OID                 |
+| ----------------------------------- | --------------------------- |
+| SNMPv2-MIB::sysDescr.0              | 1.3.6.1.2.1.1.1.0           |
+| 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:
+
+| Type              | Value         |
+| ----------------- | ------------- |
+| OCTET STRING      | 4             |
+| Integer32         | 2             |
+| NULL              | 5             |
+| OBJECT IDENTIFIER | 6             |
+| IpAddress         | 64            |
+| Counter32         | 65            |
+| Gauge32           | 66            |
+| TimeTicks         | 67            |
+| Opaque            | 68            |
+| Counter64         | 70            |
+
+You can run `./scripts/pre-commit.php -u` to run the unit tests to check your code.
+If you would like to run tests locally against a full snmpsim instance, run `./scripts/pre-commit.php -u --snmpsim`.
\ No newline at end of file
diff --git a/includes/functions.php b/includes/functions.php
index 531560efbd..2ba80502ac 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -116,6 +116,7 @@ function getHostOS($device)
 
     d_echo("| $sysDescr | $sysObjectId | \n");
 
+    $os = null;
     $pattern = $config['install_dir'] . '/includes/discovery/os/*.inc.php';
     foreach (glob($pattern) as $file) {
         include $file;
diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index 63d878d085..bca5f4599f 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -30,7 +30,7 @@ function prep_snmp_setting($device, $setting)
 {
     global $config;
 
-    if (is_numeric($device[$setting]) && $device[$setting] > 0) {
+    if (isset($device[$setting]) && is_numeric($device[$setting]) && $device[$setting] > 0) {
         return $device[$setting];
     } elseif (isset($config['snmp'][$setting])) {
         return $config['snmp'][$setting];
@@ -74,7 +74,7 @@ function gen_snmpget_cmd($device, $oids, $options = null, $mib = null, $mibdir =
 function gen_snmpwalk_cmd($device, $oids, $options = null, $mib = null, $mibdir = null)
 {
     global $config;
-    if ($device['snmpver'] == 'v1' || $config['os'][$device['os']]['nobulk']) {
+    if ($device['snmpver'] == 'v1' || (isset($device['os']) && $config['os'][$device['os']]['nobulk'])) {
         $snmpcmd = $config['snmpwalk'];
     } else {
         $snmpcmd = $config['snmpbulkwalk'];
diff --git a/scripts/pre-commit.php b/scripts/pre-commit.php
index e811bd9526..65c98281c1 100755
--- a/scripts/pre-commit.php
+++ b/scripts/pre-commit.php
@@ -1,16 +1,23 @@
 #!/usr/bin/env php
 <?php
 
+use LibreNMS\Proc;
+
 $filename = basename(__FILE__);
 $install_dir = realpath(__DIR__ . '/..');
 chdir($install_dir);
 
+require_once $install_dir . '/LibreNMS/ClassLoader.php';
+$classLoader = new LibreNMS\ClassLoader();
+$classLoader->register();
+
 $short_opts = 'lsupch';
 $long_opts = array(
     'lint',
     'style',
     'unit',
     'passthru',
+    'snmpsim',
     'commands',
     'help',
 );
@@ -19,10 +26,11 @@ $options = getopt($short_opts, $long_opts);
 if (check_opt($options, 'h', 'help')) {
     echo "LibreNMS Code Tests Script
 Running $filename without options runs all checks.
-  -l, --lint     Run php lint checks to test for valid syntax.
-  -s, --style    Run phpcs check to check for PSR-2 compliance.
-  -u, --unit     Run phpunit tests.
+  -l, --lint     Run php lint checks to test for valid syntax
+  -s, --style    Run phpcs check to check for PSR-2 compliance
+  -u, --unit     Run phpunit tests
   -p, --passthru Display output from checks as it comes
+      --snmpsim  Use snmpsim on 127.0.0.1:11161 for unit tests
   -c, --commands Print commands only, no checks
   -h, --help     Show this help text.\n";
     exit();
@@ -31,6 +39,7 @@ Running $filename without options runs all checks.
 // set up some variables
 $passthru = check_opt($options, 'p', 'passthru');
 $command_only = check_opt($options, 'c', 'commands');
+$snmpsim = check_opt($options, 'snmpsim');
 $ret = 0;
 $completed_tests = array(
     'lint' => false,
@@ -51,7 +60,7 @@ foreach (array_keys($options) as $opt) {
     } elseif ($opt == 's' || $opt == 'style') {
         $ret += run_check('style', $passthru, $command_only);
     } elseif ($opt == 'u' || $opt == 'unit') {
-        $ret += run_check('unit', $passthru, $command_only);
+        $ret += run_check('unit', $passthru, $command_only, $snmpsim);
     }
 }
 
@@ -69,19 +78,21 @@ exit($ret); //return the combined/single return value of tests
  * @param string $type type of check lint, style, or unit
  * @param bool $passthru display the output as comes in
  * @param bool $command_only only display the intended command, no checks
+ * @param bool $snmpsim Use snmpsim
  * @return int the return value from the check (0 = success)
  */
-function run_check($type, $passthru, $command_only)
+function run_check($type, $passthru, $command_only, $snmpsim = false)
 {
     global $completed_tests;
     if (getenv('SKIP_' . strtoupper($type) . '_CHECK') || $completed_tests[$type]) {
+        echo ucfirst($type) . ' check skipped.';
         return 0;
     }
 
     $function = 'check_' . $type;
     if (function_exists($function)) {
         $completed_tests[$type] = true;
-        return $function($passthru, $command_only);
+        return $function($passthru, $command_only, $snmpsim);
     }
 
     return 1;
@@ -181,18 +192,36 @@ function check_style($passthru = false, $command_only = false)
  *
  * @param bool $passthru display the output as comes in
  * @param bool $command_only only display the intended command, no checks
+ * @param bool $snmpsim send snmp requests to snmpsim listening on 127.0.0.1:11161
  * @return int the return value from phpunit (0 = success)
  */
-function check_unit($passthru = false, $command_only = false)
+function check_unit($passthru = false, $command_only = false, $snmpsim = false)
 {
     $phpunit_bin = check_exec('phpunit');
-    $phpunit_cmd = "$phpunit_bin --colors=always";
+
+    if ($snmpsim) {
+        $phpunit_cmd = "SNMPSIM=1 $phpunit_bin --colors=always";
+        $snmpsim_cmd = "snmpsimd.py --data-dir=./tests/snmpsim --agent-udpv4-endpoint=127.0.0.1:11161 --logging-method=file:/tmp/snmpsimd.log";
+    } else {
+        $phpunit_cmd = "$phpunit_bin --colors=always";
+        $snmpsim_cmd = '';
+    }
+
 
     if ($command_only) {
         echo $phpunit_cmd . PHP_EOL;
+        if ($snmpsim) {
+            echo $snmpsim_cmd . PHP_EOL;
+        }
         return 250;
     }
 
+    $proc_snmpsimd = null;
+    if ($snmpsim) {
+        echo 'Starting snmpsimd...' .  PHP_EOL;
+        $proc_snmpsimd = new Proc($snmpsim_cmd);
+    }
+
     echo 'Running unit tests... ';
     if ($passthru) {
         echo PHP_EOL;
@@ -202,11 +231,13 @@ function check_unit($passthru = false, $command_only = false)
 
         if ($phpunit_ret > 0) {
             echo "failed\n";
-            print(implode(PHP_EOL, $phpunit_output) . PHP_EOL);
+            echo implode(PHP_EOL, $phpunit_output) . PHP_EOL;
+            echo 'snmpsimd: output at /tmp/snmpsimd.log';
         } else {
             echo "success\n";
         }
     }
+    $proc_snmpsimd->terminate();
 
     return $phpunit_ret;
 }
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 94ebacce9d..037d5a0de1 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -25,1418 +25,1348 @@
 
 namespace LibreNMS\Tests;
 
-include 'tests/mocks/mock.snmp.inc.php';
-
 class DiscoveryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Set up variables and include os discovery
+     * Set up and test an os
+     * If $filename is not set, it will use the snmprec file matching $expected_os
      *
-     * @param string $expectedOS the OS to test for
-     * @param string $sysDescr set the snmp sysDescr variable
-     * @param string $sysObjectId set the snmp sysObjectId variable
-     * @param array $mockSnmp set arbitrary snmp variables with an associative array
-     * @param array $device device array to send
+     * @param string $expected_os The os we should get back from getHostOS()
+     * @param string $filename the name of the snmprec file to use
      */
-    private function checkOS($expectedOS, $sysDescr = '', $sysObjectId = '', $mockSnmp = array(), $device = array())
+    private function checkOS($expected_os, $filename = null)
     {
-        global $config;
-        setSnmpMock($mockSnmp);
-        $os = null;
+        $community = $filename ?: $expected_os;
 
-        // cannot use getHostOS() because of functions.php includes
-        $pattern = $config['install_dir'] . '/includes/discovery/os/*.inc.php';
-        foreach (glob($pattern) as $file) {
-            include $file;
-            if (isset($os)) {
-                break;
-            }
-        }
+        ob_start();
+        $os = getHostOS($this->genDevice($community));
+        $output = ob_get_contents();
+        ob_end_clean();
 
-        $this->assertEquals($expectedOS, $os);
+        $this->assertEquals($expected_os, $os, "Test file: $community.snmprec\n$output");
+    }
+
+    /**
+     * Generate a fake $device array
+     *
+     * @param string $community The snmp community to set
+     * @return array resulting device array
+     */
+    private function genDevice($community)
+    {
+        return array(
+            'device_id' => 1,
+            'hostname' => '127.0.0.1',
+            'snmpver' => 'v2c',
+            'port' => 11161,
+            'timeout' => 3,
+            'retries' => 0,
+            'snmp_max_repeaters' => 10,
+            'community' => $community,
+        );
     }
 
     public function test3com()
     {
-        $this->checkOS('3com', '3Com Switch 4500G 24-Port PWR Software Version 3Com OS V5.02.00s168p12');
-        $this->checkOS('3com', '3Com SuperStack 3 Switch 4500 26-Port Software Version 3Com OS V3.02.00s56');
-        $this->checkOS('3com', '3Com Baseline Switch 2916-SFP Plus');
+        $this->checkOS('3com');
+        $this->checkOS('3com', '3com1');
+        $this->checkOS('3com', '3com2');
     }
 
     public function testAcano()
     {
-        $this->checkOS('acano', 'Acano', '.1.3.6.1.4.1.8072.3.2.10');
+        $this->checkOS('acano');
     }
 
     public function testAcs()
     {
-        $this->checkOS('acs', 'Cisco Secure Access Control System ', '.1.3.6.1.4.1.9.1.1117');
+        $this->checkOS('acs');
     }
 
     public function testAcsw()
     {
-        $this->checkOS('acsw', 'Cisco Application Control Software');
-        $this->checkOS('acsw', 'Application Control Engine');
-        $this->checkOS('acsw', 'Cisco ACE', '.1.3.6.1.4.1.9.1.1291');
+        $this->checkOS('acsw');
+        $this->checkOS('acsw', 'acsw1');
+        $this->checkOS('acsw', 'acsw2');
     }
 
     public function testAdtranAos()
     {
-        $this->checkOS('adtran-aos', 'NetVanta');
-        $this->checkOS('adtran-aos', 'Something that we do not have', '.1.3.6.1.4.1.664');
+        $this->checkOS('adtran-aos');
+        $this->checkOS('adtran-aos', 'adtran-aos1');
     }
 
     public function testAen()
     {
-        $this->checkOS('aen', 'AMN-');
+        $this->checkOS('aen');
     }
 
     public function testAerohive()
     {
-        $this->checkOS('aerohive', 'HiveOS');
+        $this->checkOS('aerohive');
     }
 
     public function testAirport()
     {
-        $this->checkOS('airport', 'Apple AirPort');
-        $this->checkOS('airport', 'Apple Base Station');
-        $this->checkOS('airport', 'Base Station V3.84');
+        $this->checkOS('airport');
+        $this->checkOS('airport', 'airport1');
+        $this->checkOS('airport', 'airport2');
     }
 
     public function testAiros()
     {
-        $this->checkOS('airos', 'Linux', '.1.3.6.1.4.1.10002.1');
-        $this->checkOS('airos', 'Linux', '.1.3.6.1.4.1.41112.1.4');
-
-        $mockSnmp = array(
-            'dot11manufacturerName.5' => 'Ubiquiti',
-        );
-        $this->checkOS('airos', 'Linux', '', $mockSnmp);
+        $this->checkOS('airos');
+        $this->checkOS('airos', 'airos1');
+        $this->checkOS('airos', 'airos2');
     }
 
     public function testAirosAf()
     {
-        $mockSnmp = array(
-            'fwVersion.1' => '1.0',
-        );
-        $this->checkOS('airos-af', 'Linux', '.1.3.6.1.4.1.10002.1', $mockSnmp);
+        $this->checkOS('airos-af');
     }
 
     public function testAkcp()
     {
-        $this->checkOS('akcp', 'SensorProbe');
+        $this->checkOS('akcp');
     }
 
     public function testAos()
     {
-        $this->checkOS('aos', 'AOS-W', '.1.3.6.1.4.1.6486.801');
-        $this->checkOS('aos', 'Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010', '.1.3.6.1.4.1.6486.801');
+        $this->checkOS('aos');
+        $this->checkOS('aos', 'aos1');
     }
 
     public function testAllied()
     {
-        $this->checkOS('allied', 'AT-GS950/24', '.1.3.6.1.4.1.207.1');
+        $this->checkOS('allied');
     }
 
     public function testApc()
     {
-        $this->checkOS('apc', 'APC Web/SNMP Management Card (MB:v3.9.2 PF:v3.5.9 PN:apc_hw03_aos_359.bin AF1:v3.5.6 AN1:apc_hw03_nb200_356.bin MN:NBRK0200 HR:05 SN: FFFFFFFFFFFF MD:07/07/2012)', '.1.3.6.1.4.1.318.1.3.8.4');
-        $this->checkOS('apc', 'APC Switched Rack PDU');
-        $this->checkOS('apc', 'APC MasterSwitch PDU');
-        $this->checkOS('apc', 'APC Metered Rack PDU');
+        $this->checkOS('apc');
+        $this->checkOS('apc', 'apc-switched-rack');
+        $this->checkOS('apc', 'apc-masterswitch');
+        $this->checkOS('apc', 'apc-metered-rack');
     }
 
     public function testAreca()
     {
-        $this->checkOS('areca', 'Raid Subsystem V');
+        $this->checkOS('areca');
     }
 
     public function testAristaEos()
     {
-        $this->checkOS('arista_eos', 'Arista Networks EOS');
+        $this->checkOS('arista_eos');
     }
 
     public function testArubaos()
     {
-        $this->checkOS('arubaos', 'ArubaOS');
+        $this->checkOS('arubaos');
     }
 
     public function testAsa()
     {
-        $this->checkOS('asa', 'Cisco Adaptive Security Appliance');
+        $this->checkOS('asa');
     }
 
     public function testAvayaers()
     {
-        $this->checkOS('avaya-ers', 'Ethernet Routing Switch');
-        $this->checkOS('avaya-ers', 'ERS-');
+        $this->checkOS('avaya-ers');
+        $this->checkOS('avaya-ers', 'avaya-ers1');
     }
 
     public function testAvayaipo()
     {
-        $mockSnmp = array(
-            'ENTITY-MIB::entPhysicalDescr.1' => 'Avaya IP Office',
-        );
-        $this->checkOS('avaya-ipo', 'Avaya IP Office', '', $mockSnmp);
+        $this->checkOS('avaya-ipo');
     }
 
     public function testAvayavsp()
     {
-        $this->checkOS('avaya-vsp', 'VSP-4850GTS', '.1.3.6.1.4.1.2272.202');
-        $this->checkOS('avaya-vsp', 'VSP-4850GTS-PWR+', '.1.3.6.1.4.1.2272.203');
-        $this->checkOS('avaya-vsp', 'VSP-8284XSQ', '.1.3.6.1.4.1.2272.205');
-        $this->checkOS('avaya-vsp', 'VSP-4450GSX-PWR+', '.1.3.6.1.4.1.2272.206');
-        $this->checkOS('avaya-vsp', 'VSP-8404', '.1.3.6.1.4.1.2272.208');
-        $this->checkOS('avaya-vsp', 'VSP-7254XSQ', '.1.3.6.1.4.1.2272.209');
-        $this->checkOS('avaya-vsp', 'VSP-7254XTQ', '.1.3.6.1.4.1.2272.210');
+        $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');
     }
 
     public function testAvocent()
     {
-        $this->checkOS('avocent', 'Avocent');
-        $this->checkOS('avocent', 'AlterPath');
+        $this->checkOS('avocent');
+        $this->checkOS('avocent', 'avocent-alterpath');
     }
 
     public function testAvtech()
     {
-        $this->checkOS('avtech', 'Something that we do not have', '.1.3.6.1.4.1.20916.1.');
+        $this->checkOS('avtech', 'avtech-tempager4e');
     }
 
     public function testAxiscam()
     {
-        $this->checkOS('axiscam', ' ; AXIS 221; Network Camera; 4.30; Nov 29 2005 11:18; 141; 1;');
-        $this->checkOS('axiscam', ' ; AXIS M7011; Network Video Encoder; 5.75.1; Mar 04 2015 10:10; 1FC; 1;');
+        $this->checkOS('axiscam');
+        $this->checkOS('axiscam', 'axiscam-nve');
     }
 
     public function testAxisdocserver()
     {
-        $this->checkOS('axisdocserver', 'AXIS 1234 Network Document Server');
+        $this->checkOS('axisdocserver');
     }
 
     public function testBarracudaloadbalancer()
     {
-        $this->checkOS('barracudaloadbalancer', 'Barracuda Load Balancer');
-        $this->checkOS('barracudaloadbalancer', 'Barracuda Load Balancer ADC');
+        $this->checkOS('barracudaloadbalancer');
+        $this->checkOS('barracudaloadbalancer', 'barracudaloadbalancer-adc');
     }
 
     public function testBarracudaspamfirewall()
     {
-        $this->checkOS('barracudaspamfirewall', 'Barracuda Spam Firewall');
+        $this->checkOS('barracudaspamfirewall');
     }
 
     public function testBarracudangfirewall()
     {
-        $this->checkOS('barracudangfirewall', 'Barracuda Firewall');
+        $this->checkOS('barracudangfirewall');
     }
 
     public function testBcm963()
     {
-        $this->checkOS('bcm963', 'bcm963');
+        $this->checkOS('bcm963');
     }
 
     public function testBdcom()
     {
-        $this->checkOS('bdcom', 'BDCOM(tm) S2524C Software, Version 2.1.0A Build 5721', '.1.3.6.1.4.1.3320.1');
+        $this->checkOS('bdcom');
     }
 
     public function testBinos()
     {
-        $this->checkOS('binos', 'Something that we do not have', '.1.3.6.1.4.1.738.1.5.100');
+        $this->checkOS('binos');
     }
 
     public function testBinox()
     {
-        $this->checkOS('binox', 'Something that we do not have', '.1.3.6.1.4.1.738.10.5.100');
+        $this->checkOS('binox');
     }
 
     public function testBintecsmart()
     {
-        $this->checkOS('bintec-smart', 'Something that we do not have', '.1.3.6.1.4.1.272.4.201.82.78.79.48');
+        $this->checkOS('bintec-smart');
     }
 
     public function testBnt()
     {
-        $this->checkOS('bnt', 'Blade Network Technologies');
-        $this->checkOS('bnt', 'BNT ');
+        $this->checkOS('bnt');
+        $this->checkOS('bnt', 'bnt1');
     }
 
     public function testBrother()
     {
-        $this->checkOS('brother', 'Brother NC-8300h, Firmware Ver.1.14  (14.11.06),MID 8C5-F01,FID 2');
+        $this->checkOS('brother');
     }
 
     public function testBuffalo()
     {
-        $this->checkOS('buffalo', 'BUFFALO TeraStation TS5400R Ver.3.00 (2015/11/20 18:27:09)');
+        $this->checkOS('buffalo');
     }
 
     public function testCalix()
     {
-        $this->checkOS('calix', 'Something that we do not have', '.1.3.6.1.4.1.6321.1.2.2.5.3');
-        $this->checkOS('calix', 'Something that we do not have', '.1.3.6.1.4.1.6066.1.44');
-        $this->checkOS('calix', 'Something that we do not have', '.1.3.6.1.4.1.6321.1.2.3');
+        $this->checkOS('calix');
+        $this->checkOS('calix', 'calix1');
+        $this->checkOS('calix', 'calix-e7-2');
     }
 
     public function testCambium()
     {
-        $this->checkOS('cambium', 'Cambium PTP 50650');
-        $this->checkOS('cambium', 'Cambium PTP250');
-        $this->checkOS('cambium', 'Cambium PTP');
-        $this->checkOS('cambium', 'Something that we do not have', '.1.3.6.1.4.1.17713.21');
-        $this->checkOS('cambium', 'Something that we do not have', 'enterprises.17713.21');
+        $this->checkOS('cambium');
+        $this->checkOS('cambium', 'cambium-ptp');
+        $this->checkOS('cambium', 'cambium-ptp250');
+        $this->checkOS('cambium', 'cambium-ptp50650');
     }
 
     public function testCanonprinter()
     {
-        $this->checkOS('canonprinter', 'Canon MF');
-        $this->checkOS('canonprinter', 'Canon iR-ADV');
+        $this->checkOS('canonprinter', 'canonprinter-mf');
+        $this->checkOS('canonprinter', 'canonprinter-ir-adv');
     }
 
     public function testCanopy()
     {
-        $this->checkOS('canopy', 'CANOPY');
-        $this->checkOS('canopy', 'CMM');
+        $this->checkOS('canopy');
+        $this->checkOS('canopy', 'canopy-cmm');
     }
 
     public function testCat1900()
     {
-        $this->checkOS('cat1900', 'Cisco Systems Catalyst 1900');
+        $this->checkOS('cat1900');
     }
 
     public function testCatos()
     {
-        $this->checkOS('catos', 'Cisco Catalyst Operating System Software');
+        $this->checkOS('catos');
     }
 
     public function testCimc()
     {
-        $this->checkOS('cimc', 'Cisco Integrated Management Controller');
+        $this->checkOS('cimc');
     }
 
     public function testCiscosb()
     {
-        $this->checkOS('ciscosb', 'Something that we do not have', '.1.3.6.1.4.1.9.6.1.80');
-        $this->checkOS('ciscosb', 'Something that we do not have', '.1.3.6.1.4.1.9.6.1.81');
-        $this->checkOS('ciscosb', 'Something that we do not have', '.1.3.6.1.4.1.9.6.1.82');
-        $this->checkOS('ciscosb', 'Something that we do not have', '.1.3.6.1.4.1.9.6.1.83');
-        $this->checkOS('ciscosb', 'Something that we do not have', '.1.3.6.1.4.1.9.6.1.85');
-        $this->checkOS('ciscosb', 'Something that we do not have', '.1.3.6.1.4.1.9.6.1.88');
-        $this->checkOS('ciscosb', 'Something that we do not have', '.1.3.6.1.4.1.9.6.1.89');
+        $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');
     }
 
     public function testCiscosmblinux()
     {
-        $this->checkOS('ciscosmblinux', 'Linux Cisco Small Business');
+        $this->checkOS('ciscosmblinux');
     }
 
     public function testCiscowap()
     {
-        $this->checkOS('ciscowap', 'Cisco Small Business WAP');
+        $this->checkOS('ciscowap');
     }
 
     public function testCiscowlc()
     {
-        $this->checkOS('ciscowlc', 'Cisco Controller');
+        $this->checkOS('ciscowlc');
     }
 
     public function testCometsystemp85xx()
     {
-        $mockSnmp = array(
-            '.1.3.6.1.4.1.22626.1.5.2.1.3.0' => 1,
-        );
-        $this->checkOS('cometsystem-p85xx', ' Firmware Version 10-11-12 ', '', $mockSnmp);
+        $this->checkOS('cometsystem-p85xx');
     }
 
     public function testComware()
     {
-        $this->checkOS('comware', 'Comware');
-        $this->checkOS('comware', 'HP C1234 Switch Software Version');
-        $this->checkOS('comware', 'Something that we do not have', '.1.3.6.1.4.1.25506.11.1');
+        $this->checkOS('comware');
+        $this->checkOS('comware', 'comware1');
+        $this->checkOS('comware', 'comware-hp-c1234');
     }
 
     public function testCucm()
     {
-        $this->checkOS('cucm', 'Something that we do not have', '.1.3.6.1.4.1.9.1.1348');
+        $this->checkOS('cucm');
     }
 
     public function testCumulus()
     {
-        $this->checkOS('cumulus', 'Linux', '.1.3.6.1.4.1.40310');
+        $this->checkOS('cumulus');
     }
 
     public function testDatacom()
     {
-        $this->checkOS('datacom', 'Something that we do not have', '.1.3.6.1.4.1.3709');
+        $this->checkOS('datacom');
     }
 
     public function testDatadomain()
     {
-        $this->checkOS('datadomain', 'Something that we do not have', '.1.3.6.1.4.1.19746.3.1');
+        $this->checkOS('datadomain');
     }
 
     public function testDdnos()
     {
-        $mockSnmp = array(
-            'SFA-INFO::systemName.0' => 1,
-        );
-        $this->checkOS('ddnos', 'Linux', '', $mockSnmp);
+        $this->checkOS('ddnos');
     }
 
     public function testDeliberant()
     {
-        $this->checkOS('deliberant', 'Deliberant');
+        $this->checkOS('deliberant');
     }
 
     public function testDelllaser()
     {
-        $this->checkOS('dell-laser', 'Dell Color Laser');
-        $this->checkOS('dell-laser', 'Dell Laser Printer');
-        $this->checkOS('dell-laser', 'Dell something MFP');
+        $this->checkOS('dell-laser');
+        $this->checkOS('dell-laser', 'dell-laser-color');
+        $this->checkOS('dell-laser', 'dell-laser-mfp');
     }
 
     public function testDeltaups()
     {
-        $this->checkOS('deltaups', 'Something that we do not have', '.1.3.6.1.4.1.2254.2.4');
+        $this->checkOS('deltaups');
     }
 
     public function testDevelopprinter()
     {
-        $this->checkOS('developprinter', 'Something that we do not have', '.1.3.6.1.4.1.18334.1.2.1.2.1.50.2.2');
+        $this->checkOS('developprinter');
     }
 
     public function testDlinkap()
     {
-        $this->checkOS('dlinkap', 'D-Link Something AP');
-        $this->checkOS('dlinkap', 'D-Link DAP-');
-        $this->checkOS('dlinkap', 'D-Link Access Point');
+        $this->checkOS('dlinkap');
+        $this->checkOS('dlinkap', 'dlinkap1');
+        $this->checkOS('dlinkap', 'dlinkap2');
     }
 
     public function testDlink()
     {
-        $this->checkOS('dlink', 'D-Link DES-');
-        $this->checkOS('dlink', 'Dlink DES-');
-        $this->checkOS('dlink', 'DES-');
-        $this->checkOS('dlink', 'DGS-');
+        $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', 'Something that we do not have', '.1.3.6.1.4.1.6027.1.');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3042');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3044');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3054');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3055');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3056');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3046');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3057');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3058');
-        $this->checkOS('dnos', 'Something that we do not have', '.1.3.6.1.4.1.674.10895.3060');
+        $this->checkOS('dnos');
+        $this->checkOS('dnos', 'dnos1');
+        $this->checkOS('dnos', 'dnos2');
+        $this->checkOS('dnos', 'dnos3');
+        $this->checkOS('dnos', 'dnos4');
+        $this->checkOS('dnos', 'dnos5');
+        $this->checkOS('dnos', 'dnos6');
+        $this->checkOS('dnos', 'dnos7');
+        $this->checkOS('dnos', 'dnos8');
+        $this->checkOS('dnos', 'dnos9');
     }
 
     public function testDrac()
     {
-        $this->checkOS('drac', 'Dell Out-of-band SNMP Agent for Remote Access Controller');
-        $this->checkOS('drac', 'Something that we do not have', '.1.3.6.1.4.1.674.10892.2');
-        $this->checkOS('drac', 'Something that we do not have', '.1.3.6.1.4.1.674.10892.5');
+        $this->checkOS('drac');
+        $this->checkOS('drac', 'drac1');
+        $this->checkOS('drac', 'drac2');
     }
 
     public function testDsm()
     {
-        $mockSnmp = array(
-            'HOST-RESOURCES-MIB::hrSystemInitialLoadParameters.0' => 'syno_hw_version',
-        );
-        $this->checkOS('dsm', 'Linux', '', $mockSnmp);
+        $this->checkOS('dsm');
     }
 
     public function testEatonpdu()
     {
-        $this->checkOS('eatonpdu', 'Something that we do not have', '.1.3.6.1.4.1.534.6.6.7');
+        $this->checkOS('eatonpdu');
     }
 
     public function testEatonups()
     {
-        $this->checkOS('eatonups', 'Eaton 5P 2200');
-        $this->checkOS('eatonups', 'Eaton 5PX 2000');
+        $this->checkOS('eatonups', 'eaton-5p');
+        $this->checkOS('eatonups', 'eaton-5px');
     }
 
     public function testEdgeos()
     {
-        $this->checkOS('edgeos', 'EdgeOS');
-        $this->checkOS('edgeos', 'EdgeRouter Lite');
+        $this->checkOS('edgeos');
+        $this->checkOS('edgeos', 'edgeos-erl');
     }
 
     public function testEdgeswitch()
     {
-        $this->checkOS('edgeswitch', 'Something that we do not have', '.1.3.6.1.4.1.4413');
+        $this->checkOS('edgeswitch');
     }
 
     public function testEndian()
     {
-        $this->checkOS('endian', 'Linux endian');
+        $this->checkOS('endian');
     }
 
     public function testEngenius()
     {
-        $mockSnmp = array(
-            'SNMPv2-SMI::enterprises.14125.2.1.1.6.0' => 'something',
-        );
-        $this->checkOS('engenius', 'Something that we do not have', '.1.3.6.1.4.1.14125.100.1.3');
-        $this->checkOS('engenius', 'Something that we do not have', '.1.3.6.1.4.1.14125.101.1.3');
-        $this->checkOS('engenius', 'Wireless Access Point', '', $mockSnmp);
+        $this->checkOS('engenius');
+        $this->checkOS('engenius', 'engenius1');
+        $this->checkOS('engenius', 'engenius2');
     }
 
     public function testEnterasys()
     {
-        $this->checkOS('enterasys', 'Enterasys Networks');
-        $this->checkOS('enterasys', 'Something that we do not have', '.1.3.6.1.4.1.5624.2.1');
+        $this->checkOS('enterasys');
+        $this->checkOS('enterasys', 'enterasys1');
     }
 
     public function testEpson()
     {
-        $this->checkOS('epson', 'EPSON Built-in');
+        $this->checkOS('epson');
     }
 
     public function testEquallogic()
     {
-        $this->checkOS('equallogic', 'Something that we do not have', '.1.3.6.1.4.1.12740.17.1');
+        $this->checkOS('equallogic');
     }
 
     public function testExtremeware()
     {
-        $this->checkOS('extremeware', 'Something that we do not have', '.1.3.6.1.4.1.1916.2');
+        $this->checkOS('extremeware');
     }
 
     public function testF5()
     {
-        $this->checkOS('f5', 'Linux', '.1.3.6.1.4.1.3375.2.1.3.4.1000');
+        $this->checkOS('f5');
     }
 
     public function testFabos()
     {
-        $this->checkOS('fabos', 'Something that we do not have', '.1.3.6.1.4.1.1588.2.1.1.1');
-        $this->checkOS('fabos', 'Something that we do not have', '.1.3.6.1.4.1.1588.2.1.1.43');
-        $this->checkOS('fabos', 'Something that we do not have', '.1.3.6.1.4.1.1588.2.1.1.72');
+        $this->checkOS('fabos');
+        $this->checkOS('fabos', 'fabos1');
+        $this->checkOS('fabos', 'fabos2');
     }
 
     public function testFiberhome()
     {
-        // FIXME Should actually be OLT AN5516-01 but discovery is wrong
-        $this->checkOS('fiberhome', 'AN5516-06');
-        $this->checkOS('fiberhome', 'AN5516-01');
+
+        $this->checkOS('fiberhome', 'fiberhome-an5516-01');
+        $this->checkOS('fiberhome', 'fiberhome-an5516-06');
     }
 
     public function testFireware()
     {
-        $this->checkOS('fireware', 'XTM Watchguard ');
-        $this->checkOS('fireware', 'FBX Watchguard');
+        $this->checkOS('fireware', 'fireware-xtm');
+        $this->checkOS('fireware', 'fireware-fbx');
     }
 
     public function testFlareos()
     {
-        $this->checkOS('flareos', 'Something that we do not have', '.1.3.6.1.4.1.1981.1.1');
+        $this->checkOS('flareos');
     }
 
     public function testFortigate()
     {
-        $this->checkOS('fortigate', 'Something that we do not have', '.1.3.6.1.4.1.12356.15');
-        $this->checkOS('fortigate', 'Something that we do not have', '.1.3.6.1.4.1.12356.101.1');
+        $this->checkOS('fortigate');
+        $this->checkOS('fortigate', 'fortigate1');
     }
 
     public function testFortios()
     {
-        $this->checkOS('fortios', 'Something that we do not have', '.1.3.6.1.4.1.12356.103');
+        $this->checkOS('fortios');
     }
 
     public function testFoundryos()
     {
-        $this->checkOS('foundryos', 'Foundry Networks');
+        $this->checkOS('foundryos');
     }
 
     public function testFreebsd()
     {
-        $this->checkOS('freebsd', 'FreeBSD');
+        $this->checkOS('freebsd');
     }
 
     public function testFtos()
     {
-        $this->checkOS('ftos', 'Force10 Operating System');
+        $this->checkOS('ftos');
     }
 
     public function testFujitsupyos()
     {
-        $this->checkOS('fujitsupyos', 'Fujitsu PY CB Eth Switch');
+        $this->checkOS('fujitsupyos');
     }
 
     public function testFxos()
     {
-        $this->checkOS('fxos', 'Cisco FX-OS');
+        $this->checkOS('fxos');
     }
 
     public function testGaia()
     {
-        $this->checkOS('gaia', 'Something that we do not have', '.1.3.6.1.4.1.2620.1.6.123.1.49');
+        $this->checkOS('gaia');
     }
 
     public function testGamatronicups()
     {
-        $mockSnmp = array(
-            'GAMATRONIC-MIB::psUnitManufacture.0' => 'Gamatronic',
-        );
-        $this->checkOS('gamatronicups', '', '', $mockSnmp);
+        $this->checkOS('gamatronicups');
     }
 
     public function testHikvision()
     {
-        $mockSnmp = array(
-            '.1.3.6.1.4.1.39165.1.6.0' => 'Hikvision',
-        );
-        $this->checkOS('hikvision', 'Something that we do not have', '', $mockSnmp);
+        $this->checkOS('hikvision');
     }
 
     public function testHp3par()
     {
-        $this->checkOS('informos', 'Something that we do not have', '.1.3.6.1.4.1.12925.1');
+        $this->checkOS('informos');
     }
 
     public function testHpblmos()
     {
-        $this->checkOS('hpblmos', 'Something that we do not have', '.1.3.6.1.4.1.11.5.7.1.2');
+        $this->checkOS('hpblmos');
     }
 
     public function testHpmsm()
     {
-        $this->checkOS('hpmsm', 'Something that we do not have', '.1.3.6.1.4.1.8744.1');
+        $this->checkOS('hpmsm');
     }
 
     public function testHpvc()
     {
-        $this->checkOS('hpvc', 'Something that we do not have', '.1.3.6.1.4.1.11.5.7.5.1');
+        $this->checkOS('hpvc');
     }
 
     public function testHuaweiups()
     {
-        $mockSnmp = array(
-            'UPS-MIB::upsIdentManufacturer.0' => 'HUAWEI',
-        );
-        $this->checkOS('huaweiups', 'Linux GSE200M', '', $mockSnmp);
+        $this->checkOS('huaweiups');
     }
 
     public function testHwgposeidon()
     {
-        $this->checkOS('hwg-poseidon', 'Something that we do not have', '.1.3.6.1.4.1.21796.3.3');
+        $this->checkOS('hwg-poseidon');
     }
 
     public function testHwgste2()
     {
-        $this->checkOS('hwg-ste2', 'Something that we do not have', '.1.3.6.1.4.1.21796.4.9');
+        $this->checkOS('hwg-ste2');
     }
 
     public function testHwgste()
     {
-        $this->checkOS('hwg-ste', 'Something that we do not have', '.1.3.6.1.4.1.21796.4.1');
+        $this->checkOS('hwg-ste');
     }
 
     public function testHytera()
     {
-        $this->checkOS('hytera', 'Something that we do not have', '.1.3.6.1.4.1.26381');
+        $this->checkOS('hytera');
     }
 
     public function testIbmamm()
     {
-        $this->checkOS('ibm-amm', 'BladeCenter Advanced Management Module');
+        $this->checkOS('ibm-amm');
     }
 
     public function testIbmimm()
     {
-        $this->checkOS('ibm-imm', 'Something that we do not have', '.1.3.6.1.4.1.2.3.51.3');
+        $this->checkOS('ibm-imm');
     }
 
     public function testIbmnos()
     {
-        $this->checkOS('ibmnos', 'IBM Networking Operating System');
-        $this->checkOS('ibmnos', 'IBM Flex System Fabric');
-        $this->checkOS('ibmnos', 'IBM Networking OS');
+        $this->checkOS('ibmnos');
+        $this->checkOS('ibmnos', 'ibmnos1');
+        $this->checkOS('ibmnos', 'ibmnos-flex');
     }
 
     public function testIbmtl()
     {
-        $mockSnmp = array(
-            'SML-MIB::product-Name.0' => 'IBM System Storage TS3500 Tape Library',
-        );
-        $this->checkOS('ibmtl', 'Something that we do not have', '', $mockSnmp);
+        $this->checkOS('ibmtl');
     }
 
     public function testIes()
     {
-        $this->checkOS('ies', 'IES-');
+        $this->checkOS('ies');
     }
 
     public function testInfinity()
     {
-        $this->checkOS('infinity', 'NFT 2N');
+        $this->checkOS('infinity');
     }
 
     public function testIos()
     {
-        $this->checkOS('ios', 'Cisco Internetwork Operating System Software IOS (tm) s72033_rp Software (s72033_rp-PS-M), Version 12.2(18)SXD7, RELEASE SOFTWARE (fc1) Technical Support: http://www.cisco.com/techsupport Copyright (c) 1986-2005 by cisco Systems, Inc. Compiled Tue 13');
-        $this->checkOS('ios', 'IOS (tm)');
-        $this->checkOS('ios', 'Cisco IOS Software, 3800 Software (C3825-ADVIPSERVICESK9-M), Version 12.4(22)T5, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport Copyright (c) 1986-2010 by Cisco Systems, Inc. Compiled Wed 28-Apr-10 11:30 by prod_rel_team');
-        $this->checkOS('ios', 'Global Site Selector');
+        $this->checkOS('ios');
+        $this->checkOS('ios', 'ios1');
+        $this->checkOS('ios', 'ios2');
+        $this->checkOS('ios', 'ios-c3825');
     }
 
     public function testIosxe()
     {
-        $this->checkOS('iosxe', 'Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S, RELEASE SOFTWARE (fc1) Technical Support: http://www.cisco.com/techsupport Copyright (c) 1986-2011 by Cisco Systems, Inc. Compiled Thu 21-Jul-11 21:59 by mcpre');
+        $this->checkOS('iosxe');
     }
 
     public function testIosxr()
     {
-        $this->checkOS('iosxr', 'IOS XR');
+        $this->checkOS('iosxr');
     }
 
     public function testIpoman()
     {
-        $this->checkOS('ipoman', 'Something that we do not have', '.1.3.6.1.4.1.2468.1.4.2.1');
+        $this->checkOS('ipoman');
     }
 
     public function testIronware()
     {
-        $this->checkOS('ironware', 'IronWare');
+        $this->checkOS('ironware');
     }
 
     public function testIse()
     {
-        $this->checkOS('ise', 'Something that we do not have', '.1.3.6.1.4.1.9.1.2139');
-        $this->checkOS('ise', 'Something that we do not have', '.1.3.6.1.4.1.9.1.1426');
+        $this->checkOS('ise');
+        $this->checkOS('ise', 'ise1');
     }
 
     public function testJetdirect()
     {
-        $this->checkOS('jetdirect', 'JETDIRECT');
-        $this->checkOS('jetdirect', 'HP ETHERNET MULTI-ENVIRONMENT');
-        $this->checkOS('jetdirect', 'Something that we do not have', '.1.3.6.1.4.1.11.1');
+        $this->checkOS('jetdirect');
+        $this->checkOS('jetdirect', 'jetdirect1');
+        $this->checkOS('jetdirect', 'jetdirect2');
     }
 
     public function testJuniperex2500os()
     {
-        $this->checkOS('juniperex2500os', 'Something that we do not have', '.1.3.6.1.4.1.1411.102');
+        $this->checkOS('juniperex2500os');
     }
 
     public function testJunose()
     {
-        $this->checkOS('junose', 'Something that we do not have', '.1.3.6.1.4.1.4874');
+        $this->checkOS('junose');
     }
 
     public function testJunos()
     {
-        $this->checkOS('junos', 'Something that we do not have', '.1.3.6.1.4.1.2636');
-        $this->checkOS('junos', 'kernel JUNOS');
+        $this->checkOS('junos');
+        $this->checkOS('junos', 'junos1');
     }
 
     public function testJwos()
     {
-        $this->checkOS('jwos', 'Something that we do not have', '.1.3.6.1.4.1.8239.1.2.9');
+        $this->checkOS('jwos');
     }
 
     public function testKonica()
     {
-        $this->checkOS('konica', 'KONICA MINOLTA ');
+        $this->checkOS('konica');
     }
 
     public function testKyocera()
     {
-        $this->checkOS('kyocera', 'KYOCERA ');
+        $this->checkOS('kyocera');
     }
 
     public function testLanier()
     {
-        $this->checkOS('lanier', 'LANIER ');
+        $this->checkOS('lanier');
     }
 
     public function testLantronixslc()
     {
-        $this->checkOS('lantronix-slc', 'Something that we do not have', '.1.3.6.1.4.1.244.1.1');
+        $this->checkOS('lantronix-slc');
     }
 
     public function testLenovoemc()
     {
-        $this->checkOS('lenovoemc', 'EMC SOHO-NAS Storage.');
+        $this->checkOS('lenovoemc');
     }
 
     public function testLexmarkprinter()
     {
-        $this->checkOS('lexmarkprinter', 'Lexmark ');
+        $this->checkOS('lexmarkprinter');
     }
 
     public function testLiebert()
     {
-        $this->checkOS('liebert', 'Something that we do not have', '.1.3.6.1.4.1.476.1.42');
+        $this->checkOS('liebert');
     }
 
     public function testLigoos()
     {
-        $this->checkOS('ligoos', 'LigoPTP');
+        $this->checkOS('ligoos');
     }
 
     public function testLinux()
     {
-        $this->checkOS('linux', 'Linux');
+        $this->checkOS('linux');
     }
 
     public function testMacosx()
     {
-        $this->checkOS('macosx', 'Darwin Kernel Version 15', '.1.3.6.1.4.1.9999999.3.2.16');
-        $this->checkOS('macosx', 'Darwin Kernel Version 16', '.1.3.6.1.4.1.8072.3.2.255');
+        $this->checkOS('macosx');
+        $this->checkOS('macosx', 'macosx-sierra');
     }
 
     public function testMaipu()
     {
-        $this->checkOS('mypoweros', 'Something that we do not have', '.1.3.6.1.4.1.5651.1.102.21');
+        $this->checkOS('mypoweros');
     }
 
     public function testMellanox()
     {
-        $this->checkOS('mellanox', 'Something that we do not have', '.1.3.6.1.4.1.33049.1.1.1.');
+        $this->checkOS('mellanox');
     }
 
     public function testMerakimr()
     {
-        $this->checkOS('merakimr', 'Meraki MR');
+        $this->checkOS('merakimr');
     }
 
     public function testMerakims()
     {
-        $this->checkOS('merakims', 'Meraki MS');
+        $this->checkOS('merakims');
     }
 
     public function testMerakimx()
     {
-        $this->checkOS('merakimx', 'Meraki MX');
+        $this->checkOS('merakimx');
     }
 
     public function testMgepdu()
     {
-        $this->checkOS('mgepdu', 'MGE Switched PDU');
+        $this->checkOS('mgepdu');
     }
 
     public function testMgeups()
     {
-        $this->checkOS('mgeups', 'Pulsar M');
-        $this->checkOS('mgeups', 'Galaxy ');
-        $this->checkOS('mgeups', 'Evolution ');
-        $this->checkOS('mgeups', 'MGE UPS SYSTEMS - Network Management Proxy');
+        $this->checkOS('mgeups', 'mgeups-pulsar');
+        $this->checkOS('mgeups', 'mgeups-galaxy');
+        $this->checkOS('mgeups', 'mgeups-evolution');
+        $this->checkOS('mgeups', 'mgeups-proxy');
     }
 
     public function testMicrosemitime()
     {
-        $this->checkOS('microsemitime', 'Something that we do not have', '.1.3.6.1.4.1.39165.1.6');
+        $this->checkOS('microsemitime');
     }
 
     public function testMinkelsrms()
     {
-        $this->checkOS('minkelsrms', '8VD-X20');
+        $this->checkOS('minkelsrms');
     }
 
     public function testMonowall()
     {
-        $this->checkOS('monowall', 'm0n0wall');
+        $this->checkOS('monowall');
     }
 
     public function testMrvld()
     {
-        $this->checkOS('mrvld', 'LambdaDriver');
+        $this->checkOS('mrvld');
     }
 
     public function testMultimatic()
     {
-        $mockSnmp = array(
-            'UPS-MIB::upsIdentManufacturer.0' => 'Multimatic',
-        );
-        $this->checkOS('multimatic', 'CS121 ', '', $mockSnmp);
-
-        $mockSnmp = array(
-            'UPS-MIB::upsIdentManufacturer.0' => 'S2S',
-        );
-        $this->checkOS('multimatic', 'CS121', '', $mockSnmp);
+        $this->checkOS('multimatic');
+        $this->checkOS('multimatic', 'multimatic1');
     }
 
     public function testNetapp()
     {
-        $this->checkOS('netapp', 'NetApp');
+        $this->checkOS('netapp');
     }
 
     public function testNetbsd()
     {
-        $this->checkOS('netbsd', 'NetBSD');
+        $this->checkOS('netbsd');
     }
 
     public function testNetbotz()
     {
-        $this->checkOS('netbotz', 'Linux', '.1.3.6.1.4.1.5528.100.20.10.2014');
-        $this->checkOS('netbotz', 'Linux', '.1.3.6.1.4.1.5528.100.20.10.2016');
+        $this->checkOS('netbotz', 'netbotz-2014');
+        $this->checkOS('netbotz', 'netbotz-2016');
     }
 
     public function testNetgear()
     {
-        $this->checkOS('netgear', 'ProSafe');
-        $this->checkOS('netgear', 'Something that we do not have', '.1.3.6.1.4.1.4526');
+        $this->checkOS('netgear');
+        $this->checkOS('netgear', 'netgear1');
     }
 
     public function testNetmanplus()
     {
-        $this->checkOS('netmanplus', 'NetMan something plus');
-        $this->checkOS('netmanplus', 'Something that we do not have', '.1.3.6.1.4.1.5491.6');
+        $this->checkOS('netmanplus');
+        $this->checkOS('netmanplus', 'netmanplus1');
     }
 
     public function testNetonix()
     {
-        $this->checkOS('netonix', 'Something that we do not have', '.1.3.6.1.4.1.46242');
+        $this->checkOS('netonix', 'netonix-wispswitch');
     }
 
     public function testNetopia()
     {
-        $this->checkOS('netopia', 'Netopia ');
+        $this->checkOS('netopia');
     }
 
     public function testNetscaler()
     {
-        $this->checkOS('netscaler', 'Something that we do not have', '.1.3.6.1.4.1.5951.1');
+        $this->checkOS('netscaler');
     }
 
     public function testNetvision()
     {
-        $this->checkOS('netvision', 'Net Vision');
+        $this->checkOS('netvision');
     }
 
     public function testNetware()
     {
-        $this->checkOS('netware', 'Novell NetWare');
+        $this->checkOS('netware');
     }
 
     public function testNimbleos()
     {
-        $this->checkOS('nimbleos', 'Nimble Storage');
+        $this->checkOS('nimbleos');
     }
 
     public function testNios()
     {
-        $this->checkOS('nios', 'Linux 3.14.25 #1 SMP Thu Jun 16 18:19:37 EDT 2016 x86_64', '.1.3.6.1.4.1.7779.1.1402');
-        $this->checkOS('nios', 'IPAM', '.1.3.6.1.4.1.7779.1.1004');
+        $this->checkOS('nios');
+        $this->checkOS('nios', 'nios-ipam');
     }
 
     public function testNitro()
     {
-        $this->checkOS('nitro', 'Something that we do not have', '.1.3.6.1.4.1.23128.1000.1.1');
-        $this->checkOS('nitro', 'Something that we do not have', '.1.3.6.1.4.1.23128.1000.3.1');
-        $this->checkOS('nitro', 'Something that we do not have', '.1.3.6.1.4.1.23128.1000.7.1');
-        $this->checkOS('nitro', 'Something that we do not have', '.1.3.6.1.4.1.23128.1000.11.1');
+        $this->checkOS('nitro');
+        $this->checkOS('nitro', 'nitro1');
+        $this->checkOS('nitro', 'nitro2');
+        $this->checkOS('nitro', 'nitro3');
     }
 
     public function testNos()
     {
-        $this->checkOS('nos', 'Brocade VDX');
-        $this->checkOS('nos', 'BR-VDX');
-        $this->checkOS('nos', 'VDX67');
+        $this->checkOS('nos');
+        $this->checkOS('nos', 'nos1');
+        $this->checkOS('nos', 'nos2');
     }
 
     public function testNrg()
     {
-        $this->checkOS('nrg', 'NRG Network Printer');
+        $this->checkOS('nrg');
     }
 
     public function testNxos()
     {
-        $this->checkOS('nxos', 'Cisco NX-OS(tm) n3000, Software (n3000-uk9), Version 6.0(2)U1(1a), RELEASE SOFTWARE Copyright (c) 2002-2012 by Cisco Systems, Inc. Device Manager Version nms.sro not found, Compiled 7/1/2013 22:00:00');
+        $this->checkOS('nxos');
     }
 
     public function testOkilan()
     {
-        $this->checkOS('okilan', 'OKI OkiLAN');
+        $this->checkOS('okilan');
     }
 
     public function testOpensolaris()
     {
-        $this->checkOS('opensolaris', 'SunOS Something 5.11');
+        $this->checkOS('opensolaris');
     }
 
     public function testOnefs()
     {
-        $this->checkOS('onefs', 'Something that we do not have', '.1.3.6.1.4.1.12124.1');
+        $this->checkOS('onefs');
     }
 
     public function testOns()
     {
-        $this->checkOS('ons', 'Cisco ONS');
+        $this->checkOS('ons');
     }
 
     public function testOpenbsd()
     {
-        $this->checkOS('openbsd', 'Something that we do not have', '.1.3.6.1.4.1.30155.23.1');
-        $this->checkOS('openbsd', 'OpenBSD');
+        $this->checkOS('openbsd');
+        $this->checkOS('openbsd', 'openbsd1');
     }
 
     public function testOracleilom()
     {
-        $this->checkOS('oracle-ilom', 'Something that we do not have', '.1.3.6.1.4.1.42.2.200.2.1.1');
+        $this->checkOS('oracle-ilom');
     }
 
     public function testPacketshaper()
     {
-        $this->checkOS('packetshaper', 'PacketShaper');
+        $this->checkOS('packetshaper');
     }
 
     public function testPanos()
     {
-        $this->checkOS('panos', 'Palo Alto Networks');
+        $this->checkOS('panos');
     }
 
     public function testPapouchtme()
     {
-        $this->checkOS('papouch-tme', 'SNMP TME');
-        $this->checkOS('papouch-tme', 'TME');
+        $this->checkOS('papouch-tme');
+        $this->checkOS('papouch-tme', 'papouch-tme1');
     }
 
     public function testPbn()
     {
-        $this->checkOS('pbn', 'Something that we do not have', '.1.3.6.1.4.1.11606');
+        $this->checkOS('pbn');
     }
 
     public function testPcoweb()
     {
-        $mockSnmp = array(
-            'roomTemp.0' => 1,
-        );
-        $this->checkOS('pcoweb', 'Linux', '', $mockSnmp);
+        $this->checkOS('pcoweb');
     }
 
     public function testPerle()
     {
-        $this->checkOS('perle', 'Perle MCR-MGT');
+        $this->checkOS('perle');
     }
 
     public function testPfsense()
     {
-        $this->checkOS('pfsense', 'pfSense');
+        $this->checkOS('pfsense');
     }
 
     public function testPix()
     {
-        $this->checkOS('pixos', 'Cisco PIX');
+        $this->checkOS('pixos');
     }
 
     public function testPktj()
     {
-        $mockSnmp = array(
-            'GANDI-MIB::rxCounter.0' => 1,
-        );
-        $this->checkOS('pktj', 'Linux', '', $mockSnmp);
+        $this->checkOS('pktj');
     }
 
     public function testPlanetos()
     {
-        $this->checkOS('planetos', 'Something that we do not have', '.1.3.6.1.4.1.10456.1.1516');
+        $this->checkOS('planetos');
     }
 
     public function testPoweralert()
     {
-        $this->checkOS('poweralert', 'POWERALERT');
+        $this->checkOS('poweralert');
     }
 
     public function testPowervault()
     {
-        $this->checkOS('powervault', 'Something that we do not have', '.1.3.6.1.4.1.674.10893.2.102');
+        $this->checkOS('powervault');
     }
 
     public function testPowerwalker()
     {
-        $this->checkOS('powerwalker', 'Network Management Card for UPS', '.1.3.6.1.4.1.935.10');
+        $this->checkOS('powerwalker');
     }
 
     public function testPowerware()
     {
-        $this->checkOS('powerware', 'Something that we do not have', '.1.3.6.1.4.1.534');
+        $this->checkOS('powerware');
     }
 
     public function testPrestige()
     {
-        $this->checkOS('prestige', 'Prestige 100');
+        $this->checkOS('prestige');
     }
 
     public function testPrimeinfrastructure()
     {
-        $this->checkOS('primeinfrastructure', 'Something that we do not have', '.1.3.6.1.4.1.9.1.2307');
+        $this->checkOS('primeinfrastructure');
     }
 
     public function testProcera()
     {
-        $this->checkOS('procera', 'Linux', '.1.3.6.1.4.1.15397.2');
+        $this->checkOS('procera');
     }
 
     public function testProcurve()
     {
-        $this->checkOS('procurve', 'ProCurve');
-        $this->checkOS('procurve', 'HP 1820');
-        $this->checkOS('procurve', 'eCos-100');
-        $this->checkOS('procurve', 'HP 2530 ');
-        $this->checkOS('procurve', 'HP 5402R ');
+        $this->checkOS('procurve');
+        $this->checkOS('procurve', 'procurve-1820');
+        $this->checkOS('procurve', 'procurve-ecos-100');
+        $this->checkOS('procurve', 'procurve-2530');
+        $this->checkOS('procurve', 'procurve-5402r');
     }
 
     public function testProxim()
     {
-        $this->checkOS('proxim', 'Something that we do not have', '.1.3.6.1.4.1.11898.2.4.9');
+        $this->checkOS('proxim');
     }
 
     public function testPulse()
     {
-        $this->checkOS('pulse', 'Pulse Connect Secure');
+        $this->checkOS('pulse');
     }
 
     public function testQnap()
     {
-        $mockSnmp = array(
-            'ENTITY-MIB::entPhysicalMfgName.1' => 'QNAP',
-        );
-        $this->checkOS('qnap', 'Linux', '', $mockSnmp);
+        $this->checkOS('qnap');
     }
 
     public function testQuanta()
     {
-        $this->checkOS('quanta', 'vxworks', '.1.3.6.1.4.1.4413');
-        $this->checkOS('quanta', 'vxworks', '.1.3.6.1.4.1.7244');
-        $this->checkOS('quanta', 'Quanta', '.1.3.6.1.4.1.4413');
-        $this->checkOS('quanta', 'Quanta', '.1.3.6.1.4.1.7244');
+        $this->checkOS('quanta');
+        $this->checkOS('quanta', 'quanta1');
+        $this->checkOS('quanta', 'quanta2');
+        $this->checkOS('quanta', 'quanta3');
     }
 
     public function testRadlan()
     {
-        $this->checkOS('radlan', 'AT-8000');
+        $this->checkOS('radlan');
     }
 
     public function testRaisecom()
     {
-        $this->checkOS('raisecom', 'Something that we do not have', '.1.3.6.1.4.1.8886');
+        $this->checkOS('raisecom');
     }
 
     public function testRaritan()
     {
-        $this->checkOS('raritan', 'Raritan');
-        $this->checkOS('raritan', 'PX2');
+        $this->checkOS('raritan');
+        $this->checkOS('raritan', 'raritan-px2');
     }
 
     public function testRedback()
     {
-        $this->checkOS('redback', 'Redback');
+        $this->checkOS('redback');
     }
 
     public function testRicoh()
     {
-        $this->checkOS('ricoh', 'RICOH Aficio');
-        $this->checkOS('ricoh', 'RICOH Network Printer');
+        $this->checkOS('ricoh');
+        $this->checkOS('ricoh', 'ricoh-aficio');
     }
 
     public function testRiverbed()
     {
-        $this->checkOS('riverbed', 'Something that we do not have', '1.3.6.1.4.1.17163.1.1');
+        $this->checkOS('riverbed');
     }
 
     public function testRouteros()
     {
-        $mockSnmp = array(
-            'SNMPv2-SMI::enterprises.14988.1.1.4.3.0' => 1,
-        );
-        $this->checkOS('routeros', 'router', '', $mockSnmp);
-        $this->checkOS('routeros', 'RouterOS RB2011UiAS');
+        $this->checkOS('routeros');
+        $this->checkOS('routeros', 'routeros1');
     }
 
     public function testRuckuswireless()
     {
-        $this->checkOS('ruckuswireless', 'Something that we do not have', '.1.3.6.1.4.1.25053.3.1');
+        $this->checkOS('ruckuswireless');
     }
 
     public function testSaf()
     {
-        $this->checkOS('saf', 'Something that we do not have', '.1.3.6.1.4.1.7571.100.1.1.5');
+        $this->checkOS('saf');
     }
 
     public function testSamsungprinter()
     {
-        $this->checkOS('samsungprinter', 'Samsung CLX');
-        $this->checkOS('samsungprinter', 'Samsung SCX');
-        $this->checkOS('samsungprinter', 'Samsung C');
-        $this->checkOS('samsungprinter', 'Samsung S');
+        $this->checkOS('samsungprinter', 'samsungprinter-clx');
+        $this->checkOS('samsungprinter', 'samsungprinter-scx');
+        $this->checkOS('samsungprinter', 'samsungprinter-c');
+        $this->checkOS('samsungprinter', 'samsungprinter-s');
     }
 
     public function testSanos()
     {
-        $this->checkOS('sanos', 'SAN-OS');
+        $this->checkOS('sanos');
     }
 
     public function testScreenos()
     {
-        $this->checkOS('screenos', 'Something that we do not have', '.1.3.6.1.4.1.674.3224.1');
-        $this->checkOS('screenos', 'Something that we do not have', '.1.3.6.1.4.1.3224');
+        $this->checkOS('screenos');
+        $this->checkOS('screenos', 'screenos1');
     }
 
     public function testSentry3()
     {
-        $mockSnmp = array(
-            'Sentry3-MIB::serverTech.4.1.1.1.3.0' => '0 7',
-        );
-        $this->checkOS('sentry3', 'Sentry Switched ', '', $mockSnmp);
-        $this->checkOS('sentry3', 'Sentry Smart ', '', $mockSnmp);
+        $this->checkOS('sentry3', 'sentry3-switched');
+        $this->checkOS('sentry3', 'sentry3-smart');
     }
 
     public function testSentry4()
     {
-        $mockSnmp = array(
-            'Sentry3-MIB::serverTech.4.1.1.1.3.0' => '0 8',
-        );
-        $this->checkOS('sentry4', 'Sentry Switched ', '', $mockSnmp);
-        $this->checkOS('sentry4', 'Sentry Smart ', '', $mockSnmp);
+        $this->checkOS('sentry4', 'sentry4-switched');
+        $this->checkOS('sentry4', 'sentry4-smart');
     }
 
     public function testServeriron()
     {
-        $this->checkOS('serveriron', 'ServerIron');
+        $this->checkOS('serveriron');
     }
 
     public function testSharp()
     {
-        $this->checkOS('sharp', 'SHARP MX-2614N');
-        $this->checkOS('sharp', 'SHARP MX-C301W');
-        $this->checkOS('sharp', 'SHARP MX-3140N');
+        $this->checkOS('sharp', 'sharp-mx2614n');
+        $this->checkOS('sharp', 'sharp-mxc301w');
+        $this->checkOS('sharp', 'sharp-mx3140n');
     }
 
     public function testSiklu()
     {
-        $mockSnmp = array(
-            'ENTITY-MIB::entPhysicalMfgName.1' => 'Siklu',
-        );
-        $this->checkOS('siklu', 'Something that we do not have', '', $mockSnmp);
+        $this->checkOS('siklu');
     }
 
     public function testSmartax()
     {
-        $this->checkOS('smartax', 'Huawei Integrated Access Software');
+        $this->checkOS('smartax');
     }
 
     public function testSolaris()
     {
-        $this->checkOS('solaris', 'SunOS Something 5.10');
-        $this->checkOS('solaris', 'Something that we do not have', '.1.3.6.1.4.1.42.2.1.1');
+        $this->checkOS('solaris');
+        $this->checkOS('solaris', 'solaris1');
     }
 
     public function testSonicwall()
     {
-        $this->checkOS('sonicwall', 'SonicWALL');
+        $this->checkOS('sonicwall');
     }
 
     public function testSonusgsx()
     {
-        $this->checkOS('sonus-gsx', 'Something that we do not have', '.1.3.6.1.4.1.2879.1.1.2');
+        $this->checkOS('sonus-gsx');
     }
 
     public function testSonussbc()
     {
-        $this->checkOS('sonus-sbc', 'Something that we do not have', '.1.3.6.1.4.1.2879.1.9.2');
-        $this->checkOS('sonus-sbc', 'Something that we do not have', '.1.3.6.1.4.1.177.15.1.1.1');
+        $this->checkOS('sonus-sbc');
+        $this->checkOS('sonus-sbc', 'sonus-sbc1');
     }
 
     public function testSophos()
     {
-        $this->checkOS('sophos', 'Linux g56fa85e');
-        $this->checkOS('sophos', 'Linux gc80f187');
-        $this->checkOS('sophos', 'Linux g829be90');
-        $this->checkOS('sophos', 'Linux g63c0044');
+        $this->checkOS('sophos');
+        $this->checkOS('sophos', 'sophos1');
+        $this->checkOS('sophos', 'sophos2');
+        $this->checkOS('sophos', 'sophos3');
     }
 
     public function testSpeedtouch()
     {
-        $this->checkOS('speedtouch', 'TG585v7');
-        $this->checkOS('speedtouch', 'SpeedTouch ');
-        $this->checkOS('speedtouch', 'ST5000');
+        $this->checkOS('speedtouch');
+        $this->checkOS('speedtouch', 'speedtouch-tg585');
+        $this->checkOS('speedtouch', 'speedtouch-st5000');
     }
 
     public function testSub10()
     {
-        $this->checkOS('sub10', 'Something that we do not have', '.1.3.6.1.4.1.39003');
+        $this->checkOS('sub10');
     }
 
     public function testSupermicroswitch()
     {
-        $this->checkOS('supermicro-switch', 'Supermicro Switch');
-        $this->checkOS('supermicro-switch', 'SSE-');
-        $this->checkOS('supermicro-switch', 'SBM-');
+        $this->checkOS('supermicro-switch');
+        $this->checkOS('supermicro-switch', 'supermicro-switch-sse');
+        $this->checkOS('supermicro-switch', 'supermicro-switch-sbm');
     }
 
     public function testSwos()
     {
-        $mockSnmp = array(
-            'SNMPv2-MIB::sysName.0' => 'MikroTik'
-        );
-        $this->checkOS('swos', 'RB250GS', '', $mockSnmp);
-        $this->checkOS('swos', 'RB260GS', '', $mockSnmp);
-        $this->checkOS('swos', 'RB260GSP', '', $mockSnmp);
+        $this->checkOS('swos', 'swos-rb250gs');
+        $this->checkOS('swos', 'swos-rb260gs');
+        $this->checkOS('swos', 'swos-rb260gsp');
     }
 
     public function testSymbol()
     {
-        $this->checkOS('symbol', 'Something that we do not have', '.1.3.6.1.4.1.388');
+        $this->checkOS('symbol');
     }
 
     public function testTimos()
     {
-        $this->checkOS('timos', 'Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010', '.1.3.6.1.4.1.6527.1.3');
-        $this->checkOS('timos', 'Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010', '.1.3.6.1.4.1.6527.6.2.1.2.2.');
-        $this->checkOS('timos', 'Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010', '.1.3.6.1.4.1.6527.1.6.1');
-        $this->checkOS('timos', 'Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010', '.1.3.6.1.4.1.6527.6.1.1.2.');
-        $this->checkOS('timos', 'Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010', '.1.3.6.1.4.1.6527.1.9.1');
-        $this->checkOS('timos', 'Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010', '.1.3.6.1.4.1.6527.1.15.');
+        $this->checkOS('timos');
+        $this->checkOS('timos', 'timos1');
+        $this->checkOS('timos', 'timos2');
+        $this->checkOS('timos', 'timos3');
+        $this->checkOS('timos', 'timos4');
+        $this->checkOS('timos', 'timos5');
     }
 
     public function testTpconductor()
     {
-        $this->checkOS('tpconductor', 'Something that we do not have', '.1.3.6.1.4.1.5596.180.6.4.1');
+        $this->checkOS('tpconductor');
     }
 
     public function testTplink()
     {
-        $this->checkOS('tplink', 'Something that we do not have', '.1.3.6.1.4.1.11863.1.1');
+        $this->checkOS('tplink');
     }
 
     public function testTranzeo()
     {
-        $this->checkOS('tranzeo', 'Tranzeo');
+        $this->checkOS('tranzeo');
     }
 
     public function testUnifi()
     {
-        $mockSnmp = array(
-            'dot11manufacturerProductName.6' => 'UAP',
-        );
-        $this->checkOS('unifi', 'Linux', '.1.3.6.1.4.1.10002.1', $mockSnmp);
-
-        $mockSnmp = array(
-            'dot11manufacturerProductName.4' => 'UAP-PRO',
-        );
-        $this->checkOS('unifi', 'Linux', '.1.3.6.1.4.1.10002.1', $mockSnmp);
-
-        $mockSnmp = array(
-            'dot11manufacturerProductName.0' => 'UAP-AC2',
-        );
-        $this->checkOS('unifi', 'Linux', '.1.3.6.1.4.1.10002.1', $mockSnmp);
+        $this->checkOS('unifi');
     }
 
     public function testVccodec()
     {
-        $this->checkOS('vccodec', 'Something that we do not have', '.1.3.6.1.4.1.5596.150.6.4.1');
+        $this->checkOS('vccodec');
     }
 
     public function testVcs()
     {
-        $this->checkOS('vcs', 'Something that we do not have', '.1.3.6.1.4.1.5596.130.6.4.1');
+        $this->checkOS('vcs');
     }
 
     public function testViprinux()
     {
-        $this->checkOS('viprinux', 'Viprinet VPN Router');
+        $this->checkOS('viprinux');
     }
 
     public function testVmware()
     {
-        $this->checkOS('vmware', 'VMware ESX');
-        $this->checkOS('vmware', 'VMware-vCenter-Server-Appliance');
+        $this->checkOS('vmware', 'vmware-esx');
+        $this->checkOS('vmware', 'vmware-vcsa');
     }
 
     public function testVoswall()
     {
-        $this->checkOS('voswall', 'Voswall');
+        $this->checkOS('voswall');
     }
 
     public function testVrp()
     {
-        $this->checkOS('vrp', 'VRP (R) Software');
-        $this->checkOS('vrp', 'VRP Software Version');
-        $this->checkOS('vrp', 'Software Version VRP');
-        $this->checkOS('vrp', 'Versatile Routing Platform Software');
+        $this->checkOS('vrp');
+        $this->checkOS('vrp', 'vrp1');
+        $this->checkOS('vrp', 'vrp2');
+        $this->checkOS('vrp', 'vrp3');
     }
 
     public function testVyatta()
     {
-        $this->checkOS('vyatta', 'Vyatta');
+        $this->checkOS('vyatta');
     }
 
     public function testVyos()
     {
-        $this->checkOS('vyos', 'Vyatta VyOS');
-        $this->checkOS('vyos', 'VyOS');
-        $this->checkOS('vyos', 'vyos');
+        $this->checkOS('vyos');
+        $this->checkOS('vyos', 'vyos1');
+        $this->checkOS('vyos', 'vyos-vyatta');
     }
 
     public function testWaas()
     {
-        $this->checkOS('waas', 'Cisco Wide Area Application Services');
+        $this->checkOS('waas');
     }
 
     public function testWatchguard()
     {
-        $this->checkOS('firebox', 'WatchGuard Fireware');
-        $this->checkOS('firebox', 'Something that we do not have', '.1.3.6.1.4.1.3097.1.5');
+        $this->checkOS('firebox');
+        $this->checkOS('firebox', 'firebox1');
     }
 
     public function testWebpower()
     {
-        $this->checkOS('webpower', 'Something that we do not have', '.1.3.6.1.4.1.2468.1.2.1');
+        $this->checkOS('webpower');
     }
 
     public function testWindows()
     {
-        $this->checkOS('windows', 'Something that we do not have', '.1.3.6.1.4.1.311.1.1.3');
-        $this->checkOS('windows', 'Hardware: Intel64 Family 6 Model 28 Stepping 10 AT/AT COMPATIBLE - Software: Windows Version 6.3 (Build 9600 Multiprocessor Free)');
+        $this->checkOS('windows');
+        $this->checkOS('windows', 'windows1');
     }
 
     public function testWxgoos()
     {
-        $this->checkOS('wxgoos', 'NETOS 6.0', '.1.3.6.1.4.1.901.1');
-        $this->checkOS('wxgoos', 'Something that we do not have', '.1.3.6.1.4.1.17373');
+        $this->checkOS('wxgoos');
+        $this->checkOS('wxgoos', 'wxgoos1');
     }
 
     public function testXerox()
     {
-        $this->checkOS('xerox', 'Xerox Phaser');
-        $this->checkOS('xerox', 'Xerox WorkCentre');
-        $this->checkOS('xerox', 'FUJI XEROX DocuPrint');
+        $this->checkOS('xerox', 'xerox-phaser');
+        $this->checkOS('xerox', 'xerox-workcentre');
+        $this->checkOS('xerox', 'xerox-docuprint');
     }
 
     public function testXirrus()
     {
-        $this->checkOS('xirrus_aos', 'Xirrus ArrayOS');
+        $this->checkOS('xirrus_aos');
     }
 
     public function testXos()
     {
-        $this->checkOS('xos', 'XOS');
+        $this->checkOS('xos');
     }
 
     public function testZxr10()
     {
-        $this->checkOS('zxr10', 'ZTE Ethernet Switch  ZXR10 5250-52TM-H, Version: V2.05.11B23');
+        $this->checkOS('zxr10');
     }
 
     public function testZynos()
     {
-        $this->checkOS('zynos', 'ES Something', '.1.3.6.1.4.1.890');
-        $this->checkOS('zynos', 'GS Something', '.1.3.6.1.4.1.890');
+        $this->checkOS('zynos', 'zynos-es');
+        $this->checkOS('zynos', 'zynos-gs');
     }
 
     public function testZywall()
     {
-        $this->checkOS('zywall', 'ZyWALL 2X');
-        $this->checkOS('zywall', 'ZyWALL 2X', '.1.3.6.1.4.1.890.1.15');
+        $this->checkOS('zywall');
     }
 
     public function testZyxelnwa()
     {
-        $this->checkOS('zyxelnwa', 'NWA-');
+        $this->checkOS('zyxelnwa');
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b63ba323d7..df8cf37c67 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -26,13 +26,27 @@
 // get the current LibreNMS install directory
 $install_dir = realpath(__DIR__ . '/..');
 
-require_once $install_dir . '/includes/defaults.inc.php';
+require $install_dir . '/includes/defaults.inc.php';
+
+// definitions, don't want to initialize mysql...
+$config['install_dir'] = $install_dir;
+$config['mibdir'] = $install_dir . '/mibs';
+$config['snmpget'] = 'snmpget';
+$runtime_stats = array('snmpget' => 0, 'snmpwalk' => 0);
 
 $classLoader->registerDir($install_dir . '/tests', 'LibreNMS\Tests');
 
-require_once $install_dir . '/includes/common.php';
-require_once $install_dir . '/includes/rrdtool.inc.php';
-require_once $install_dir . '/includes/syslog.php';
+require $install_dir . '/includes/common.php';
+if (getenv('SNMPSIM')) {
+    require $install_dir . '/includes/functions.php';
+} else {
+    require $install_dir . '/includes/rrdtool.inc.php';
+    require $install_dir . '/includes/syslog.php';
+    require $install_dir . '/tests/mocks/mock.snmp.inc.php';
+}
 
 ini_set('display_errors', 1);
-ini_set('error_reporting', E_ALL);
+error_reporting(E_ALL & ~E_WARNING);
+//error_reporting(E_ALL);
+//$debug=true;
+//$vdebug=true;
diff --git a/tests/mocks/mock.snmp.inc.php b/tests/mocks/mock.snmp.inc.php
index c88d2abc3f..75e785815f 100644
--- a/tests/mocks/mock.snmp.inc.php
+++ b/tests/mocks/mock.snmp.inc.php
@@ -23,37 +23,229 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-function setSnmpMock($mockSnmpArray)
-{
-    global $mockSnmp;
-    $mockSnmp = $mockSnmpArray;
-}
+$snmpMockCache = array();
 
-function snmp_get($device, $oid)
+/**
+ * Cache the data from an snmprec file
+ * in ./tests/snmpsim/
+ *
+ * @param string $file the snmprec file name (excluding .snmprec)
+ */
+function cache_snmprec($file)
 {
-    global $mockSnmp;
-    if (isset($mockSnmp) && !empty($mockSnmp)) {
-        if (isset($mockSnmp[$oid])) {
-            return $mockSnmp[$oid];
-        }
+    global $config, $snmpMockCache;
+    if (isset($snmpMockCache[$file])) {
+        return;
+    }
+    $snmpMockCache[$file] = array();
+
+    $data = file_get_contents($config['install_dir'] . "/tests/snmpsim/$file.snmprec");
+    $line = strtok($data, "\r\n");
+    while ($line !== false) {
+        list($oid, $type, $data) = explode('|', $line, 3);
+        if ($type == 4) {
+            $data = trim($data);
+        } elseif ($type == 6) {
+            $data = trim($data, '.');
+        }
+
+        $snmpMockCache[$file][$oid] = array($type, $data);
+        $line = strtok("\r\n");
     }
-    return false;
 }
 
-function snmp_walk($device, $oid)
+/**
+ * Get all data of the specified $community from the snmprec cache
+ *
+ * @param string $community snmp community to return
+ * @return array array of the data containing: [$oid][$type, $data]
+ * @throws Exception this $community is not cached
+ */
+function snmprec_get($community)
 {
-    global $mockSnmp;
+    global $snmpMockCache;
+    cache_snmprec($community);
+    var_dump($snmpMockCache);
+
+    if (isset($snmpMockCache[$community])) {
+        return $snmpMockCache[$community];
+    }
+
+    throw new Exception("SNMPREC: community $community not cached");
+}
+
+/**
+ * Get an $oid from the specified $community
+ *
+ * @param string $community the community to fetch data from
+ * @param string $oid numeric oid of data to fetch
+ * @return array array of the data containing: [$type, $data]
+ * @throws Exception this $oid is not cached
+ */
+function snmprec_get_oid($community, $oid)
+{
+    global $snmpMockCache;
+    cache_snmprec($community);
+
+    if (isset($snmpMockCache[$community]) && isset($snmpMockCache[$community][$oid])) {
+        return $snmpMockCache[$community][$oid];
+    }
+
+    throw new Exception("SNMPREC: oid $community:$oid not cached");
+}
+
+/**
+ * Get the numeric oid of an oid
+ * The leading dot is ommited by default to be compatible with snmpsim
+ *
+ * @param string $oid the oid to tranlslate
+ * @param string $mib mib to use
+ * @param string $mibdir mib dir to look for mib in
+ * @return string the oid in numeric format (.1.3.4.5)
+ * @throws Exception Could not translate the oid
+ */
+function snmp_translate_number($oid, $mib = null, $mibdir = null)
+{
+    global $config;
+
+    // optimizations (35s -> 1.6s on my laptop)
+    if ($oid == 'SNMPv2-MIB::sysDescr.0') {
+        return '1.3.6.1.2.1.1.1.0';
+    }
+    if ($oid == 'SNMPv2-MIB::sysObjectID.0') {
+        return '1.3.6.1.2.1.1.2.0';
+    }
+    if ($oid == 'ENTITY-MIB::entPhysicalDescr.1') {
+        return '1.3.6.1.2.1.47.1.1.1.1.2.1';
+    }
+    if ($oid == 'SML-MIB::product-Name.0') {
+        return '1.3.6.1.4.1.2.6.182.3.3.1.0';
+    }
+    if ($oid == 'ENTITY-MIB::entPhysicalMfgName.1') {
+        return '1.3.6.1.2.1.47.1.1.1.1.12.1';
+    }
+    if ($oid == 'GAMATRONIC-MIB::psUnitManufacture.0') {
+        return '1.3.6.1.4.1.6050.1.1.2.0';
+    }
+    // end optimizations
+
+    if (preg_match('/^[\.\d]*$/', $oid)) {
+        return ltrim($oid, '.');
+    }
+
+    $cmd = "snmptranslate -IR -On $oid";
+    $cmd .= ' -M ' . (isset($mibdir) ? $mibdir : $config['mibdir']);
+    if (isset($mib) && $mib) {
+        $cmd .= " -m $mib";
+    }
+
+    $number = shell_exec($cmd);
+
+    if (empty($number)) {
+        throw new Exception('Could not translate oid: ' . $oid . PHP_EOL . 'Tried: ' . $cmd);
+    }
+
+    return trim($number, ". \n\r");
+}
+
+function snmp_translate_type($oid, $mib = null, $mibdir = null)
+{
+    global $config;
+
+    $cmd = "snmptranslate -IR -Td $oid";
+    $cmd .= ' -M ' . (isset($mibdir) ? $mibdir : $config['mibdir']);
+    if (isset($mib) && $mib) {
+        $cmd .= " -m $mib";
+    }
+
+    $result = shell_exec($cmd);
+
+    if (empty($result)) {
+        throw new Exception('Could not translate oid: ' . $oid . PHP_EOL . 'Tried: ' . $cmd);
+    }
+
+    if (str_contains($result, 'OCTET STRING')) {
+        return 4;
+    }
+    if (str_contains($result, 'Integer32')) {
+        return 2;
+    }
+    if (str_contains($result, 'NULL')) {
+        return 5;
+    }
+    if (str_contains($result, 'OBJECT IDENTIFIER')) {
+        return 6;
+    }
+    if (str_contains($result, 'IpAddress')) {
+        return 64;
+    }
+    if (str_contains($result, 'Counter32')) {
+        return 65;
+    }
+    if (str_contains($result, 'Gauge32')) {
+        return 66;
+    }
+    if (str_contains($result, 'TimeTicks')) {
+        return 67;
+    }
+    if (str_contains($result, 'Opaque')) {
+        return 68;
+    }
+    if (str_contains($result, 'Counter64')) {
+        return 70;
+    }
+
+    throw new Exception('Unknown type');
+}
+
+// Mocked functions
+
+function snmp_get($device, $oid, $options = null, $mib = null, $mibdir = null)
+{
+    $community = $device['community'];
+    $num_oid = snmp_translate_number($oid, $mib, $mibdir);
+
+    try {
+        $data = snmprec_get_oid($community, $num_oid);
+
+        $result = $data[1];
+        if ($data[0] == 6) {
+            $result = '.' . $data[1];
+        }
+
+        d_echo("[SNMP] snmpget $community $num_oid: $result\n");
+
+        return $result;
+    } catch (Exception $e) {
+        d_echo("[SNMP] snmpget $community $num_oid: no data\n");
+        return false;
+    }
+}
+
+function snmp_walk($device, $oid, $options = null, $mib = null, $mibdir = null)
+{
+    $community = $device['community'];
+    $dev = snmprec_get($community);
+    $num_oid = snmp_translate_number($oid, $mib, $mibdir);
+
     $output = '';
-    foreach ($mockSnmp as $key => $value) {
-        if (starts_with($key, $oid)) {
-            $output .= $value . PHP_EOL;
+    foreach ($dev as $key => $data) {
+        if (starts_with($key, $num_oid)) {
+            if ($data[0] == 6) {
+                $output .= '.' . $data[1] . PHP_EOL;
+            } else {
+                $output .= $data[1] . PHP_EOL;
+            }
         }
     }
 
+    d_echo("[SNMP] snmpwalk $community $num_oid: ");
     if (empty($output)) {
+        d_echo("no data\n");
         // does this match the behavior of the real snmp_walk()?
         return false;
     } else {
+        d_echo($output);
         return $output;
     }
 }
@@ -62,3 +254,24 @@ function register_mibs()
 {
     // stub
 }
+
+function getHostOS($device)
+{
+    global $config;
+
+    $sysDescr = snmp_get($device, "SNMPv2-MIB::sysDescr.0", "-Ovq");
+    $sysObjectId = snmp_get($device, "SNMPv2-MIB::sysObjectID.0", "-Ovqn");
+
+    d_echo("| $sysDescr | $sysObjectId | \n");
+
+    $os = null;
+    $pattern = $config['install_dir'] . '/includes/discovery/os/*.inc.php';
+    foreach (glob($pattern) as $file) {
+        include $file;
+        if (isset($os)) {
+            return $os;
+        }
+    }
+
+    return "generic";
+}
diff --git a/tests/snmpsim/3com.snmprec b/tests/snmpsim/3com.snmprec
new file mode 100644
index 0000000000..b616107ea7
--- /dev/null
+++ b/tests/snmpsim/3com.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|3Com Switch 4500G 24-Port PWR Software Version 3Com OS V5.02.00s168p12
diff --git a/tests/snmpsim/3com1.snmprec b/tests/snmpsim/3com1.snmprec
new file mode 100644
index 0000000000..47e2a02306
--- /dev/null
+++ b/tests/snmpsim/3com1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|3Com SuperStack 3 Switch 4500 26-Port Software Version 3Com OS V3.02.00s56
diff --git a/tests/snmpsim/3com2.snmprec b/tests/snmpsim/3com2.snmprec
new file mode 100644
index 0000000000..ff135bf0eb
--- /dev/null
+++ b/tests/snmpsim/3com2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|3Com Baseline Switch 2916-SFP Plus
diff --git a/tests/snmpsim/README.md b/tests/snmpsim/README.md
new file mode 100644
index 0000000000..3c27642933
--- /dev/null
+++ b/tests/snmpsim/README.md
@@ -0,0 +1,31 @@
+## Instructions
+Copy the skel.snmprec file to the desired filename this must start with the os name. This skel.snmprec file contains empty sysDescr and sysObjectID entries.
+
+## File format
+Data file format is optimized to be compact, human-readable and inexpensive to parse. It's also important to store full and exact response information in a most intact 
+form. Here's an example data file content:
+
+1.3.6.1.2.1.1.1.0|4|Linux 2.6.25.5-smp SMP Tue Jun 19 14:58:11 CDT 2007 i686
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10
+1.3.6.1.2.1.1.3.0|67|233425120
+1.3.6.1.2.1.2.2.1.6.2|4x|00127962f940
+1.3.6.1.2.1.4.22.1.3.2.192.21.54.7|64x|c3dafe61
+There is a pipe-separated triplet of OID-tag-value items where:
+
+OID is a dot-separated set of numbers.
+Tag is a BER-encoded ASN.1 tag. When value is hexified, an 'x' literal is appended. Reference to a variation module can also be embedded into tag.
+Value is either a printable string, a number or a hexifed value.
+Valid tag values and their corresponding ASN.1/SNMP types are:
+
+| type | value |
+| --- | --- |
+| Integer32 | 2 |
+| OCTET STRING | 4 |
+| NULL | 5 |
+| OBJECT IDENTIFIER | 6 |
+| IpAddress | 64 |
+| Counter32 | 65 |
+| Gauge32 | 66 |
+| TimeTicks | 67 |
+| Opaque | 68 |
+| Counter64 | 70 |
diff --git a/tests/snmpsim/acano.snmprec b/tests/snmpsim/acano.snmprec
new file mode 100644
index 0000000000..5f9df3d2ba
--- /dev/null
+++ b/tests/snmpsim/acano.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Acano
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10
diff --git a/tests/snmpsim/acs.snmprec b/tests/snmpsim/acs.snmprec
new file mode 100644
index 0000000000..99a1dcbd98
--- /dev/null
+++ b/tests/snmpsim/acs.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Secure Access Control System 
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.1117
diff --git a/tests/snmpsim/acsw.snmprec b/tests/snmpsim/acsw.snmprec
new file mode 100644
index 0000000000..2abb613303
--- /dev/null
+++ b/tests/snmpsim/acsw.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Application Control Software
diff --git a/tests/snmpsim/acsw1.snmprec b/tests/snmpsim/acsw1.snmprec
new file mode 100644
index 0000000000..aa7082fe97
--- /dev/null
+++ b/tests/snmpsim/acsw1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Application Control Engine
diff --git a/tests/snmpsim/acsw2.snmprec b/tests/snmpsim/acsw2.snmprec
new file mode 100644
index 0000000000..e3ad053e64
--- /dev/null
+++ b/tests/snmpsim/acsw2.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Cisco ACE
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.1291
diff --git a/tests/snmpsim/adtran-aos.snmprec b/tests/snmpsim/adtran-aos.snmprec
new file mode 100644
index 0000000000..de41ca7180
--- /dev/null
+++ b/tests/snmpsim/adtran-aos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|NetVanta
diff --git a/tests/snmpsim/adtran-aos1.snmprec b/tests/snmpsim/adtran-aos1.snmprec
new file mode 100644
index 0000000000..1423c8f119
--- /dev/null
+++ b/tests/snmpsim/adtran-aos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.664
diff --git a/tests/snmpsim/aen.snmprec b/tests/snmpsim/aen.snmprec
new file mode 100644
index 0000000000..5502a1729f
--- /dev/null
+++ b/tests/snmpsim/aen.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|AMN-
diff --git a/tests/snmpsim/aerohive.snmprec b/tests/snmpsim/aerohive.snmprec
new file mode 100644
index 0000000000..bf3c938ae4
--- /dev/null
+++ b/tests/snmpsim/aerohive.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|HiveOS
diff --git a/tests/snmpsim/airos-af.snmprec b/tests/snmpsim/airos-af.snmprec
new file mode 100644
index 0000000000..9f859189ea
--- /dev/null
+++ b/tests/snmpsim/airos-af.snmprec
@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.10002.1
+1.3.6.1.4.1.41112.1.3.2.1.40.1|4|1.0
diff --git a/tests/snmpsim/airos.snmprec b/tests/snmpsim/airos.snmprec
new file mode 100644
index 0000000000..f8ae7c6e96
--- /dev/null
+++ b/tests/snmpsim/airos.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.10002.1
diff --git a/tests/snmpsim/airos1.snmprec b/tests/snmpsim/airos1.snmprec
new file mode 100644
index 0000000000..48aae9a912
--- /dev/null
+++ b/tests/snmpsim/airos1.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.41112.1.4
diff --git a/tests/snmpsim/airos2.snmprec b/tests/snmpsim/airos2.snmprec
new file mode 100644
index 0000000000..bd93a7ffdc
--- /dev/null
+++ b/tests/snmpsim/airos2.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.2.840.10036.3.1.2.1.2.5|4|Ubiquiti
diff --git a/tests/snmpsim/airport.snmprec b/tests/snmpsim/airport.snmprec
new file mode 100644
index 0000000000..9b33d6b52f
--- /dev/null
+++ b/tests/snmpsim/airport.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Apple AirPort
diff --git a/tests/snmpsim/airport1.snmprec b/tests/snmpsim/airport1.snmprec
new file mode 100644
index 0000000000..71d249ed58
--- /dev/null
+++ b/tests/snmpsim/airport1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Apple Base Station
diff --git a/tests/snmpsim/airport2.snmprec b/tests/snmpsim/airport2.snmprec
new file mode 100644
index 0000000000..97552f9fdf
--- /dev/null
+++ b/tests/snmpsim/airport2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Base Station V3.84
diff --git a/tests/snmpsim/akcp.snmprec b/tests/snmpsim/akcp.snmprec
new file mode 100644
index 0000000000..5a02200cce
--- /dev/null
+++ b/tests/snmpsim/akcp.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SensorProbe
diff --git a/tests/snmpsim/allied.snmprec b/tests/snmpsim/allied.snmprec
new file mode 100644
index 0000000000..a58247fa9b
--- /dev/null
+++ b/tests/snmpsim/allied.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|AT-GS950/24
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.207.1
diff --git a/tests/snmpsim/aos.snmprec b/tests/snmpsim/aos.snmprec
new file mode 100644
index 0000000000..afad45906a
--- /dev/null
+++ b/tests/snmpsim/aos.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|AOS-W
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.801
diff --git a/tests/snmpsim/aos1.snmprec b/tests/snmpsim/aos1.snmprec
new file mode 100644
index 0000000000..7bb8aecb72
--- /dev/null
+++ b/tests/snmpsim/aos1.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6486.801
diff --git a/tests/snmpsim/apc-masterswitch.snmprec b/tests/snmpsim/apc-masterswitch.snmprec
new file mode 100644
index 0000000000..2fa34d92b0
--- /dev/null
+++ b/tests/snmpsim/apc-masterswitch.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|APC Switched Rack PDU
diff --git a/tests/snmpsim/apc-metered-rack.snmprec b/tests/snmpsim/apc-metered-rack.snmprec
new file mode 100644
index 0000000000..e4cfbb135d
--- /dev/null
+++ b/tests/snmpsim/apc-metered-rack.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|APC Metered Rack PDU
diff --git a/tests/snmpsim/apc-switched-rack.snmprec b/tests/snmpsim/apc-switched-rack.snmprec
new file mode 100644
index 0000000000..2fa22796ff
--- /dev/null
+++ b/tests/snmpsim/apc-switched-rack.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|APC MasterSwitch PDU
diff --git a/tests/snmpsim/apc.snmprec b/tests/snmpsim/apc.snmprec
new file mode 100644
index 0000000000..90ff8db5f0
--- /dev/null
+++ b/tests/snmpsim/apc.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|APC Web/SNMP Management Card (MB:v3.9.2 PF:v3.5.9 PN:apc_hw03_aos_359.bin AF1:v3.5.6 AN1:apc_hw03_nb200_356.bin MN:NBRK0200 HR:05 SN: FFFFFFFFFFFF MD:07/07/2012)
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.318.1.3.8.4
diff --git a/tests/snmpsim/areca.snmprec b/tests/snmpsim/areca.snmprec
new file mode 100644
index 0000000000..f77b252818
--- /dev/null
+++ b/tests/snmpsim/areca.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Raid Subsystem V
diff --git a/tests/snmpsim/arista_eos.snmprec b/tests/snmpsim/arista_eos.snmprec
new file mode 100644
index 0000000000..ba2656a4e8
--- /dev/null
+++ b/tests/snmpsim/arista_eos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Arista Networks EOS
diff --git a/tests/snmpsim/arubaos.snmprec b/tests/snmpsim/arubaos.snmprec
new file mode 100644
index 0000000000..f439b9e196
--- /dev/null
+++ b/tests/snmpsim/arubaos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|ArubaOS
diff --git a/tests/snmpsim/asa.snmprec b/tests/snmpsim/asa.snmprec
new file mode 100644
index 0000000000..beb99f27ac
--- /dev/null
+++ b/tests/snmpsim/asa.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Adaptive Security Appliance
diff --git a/tests/snmpsim/avaya-ers.snmprec b/tests/snmpsim/avaya-ers.snmprec
new file mode 100644
index 0000000000..f1191e15ee
--- /dev/null
+++ b/tests/snmpsim/avaya-ers.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Ethernet Routing Switch
diff --git a/tests/snmpsim/avaya-ers1.snmprec b/tests/snmpsim/avaya-ers1.snmprec
new file mode 100644
index 0000000000..db1ea49c76
--- /dev/null
+++ b/tests/snmpsim/avaya-ers1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|ERS-
diff --git a/tests/snmpsim/avaya-ipo.snmprec b/tests/snmpsim/avaya-ipo.snmprec
new file mode 100644
index 0000000000..d830e04c8f
--- /dev/null
+++ b/tests/snmpsim/avaya-ipo.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Avaya IP Office
+1.3.6.1.2.1.47.1.1.1.1.2.1|4|Avaya IP Office
diff --git a/tests/snmpsim/avaya-vsp-4450gsx-pwr.snmprec b/tests/snmpsim/avaya-vsp-4450gsx-pwr.snmprec
new file mode 100644
index 0000000000..3aeee9eb57
--- /dev/null
+++ b/tests/snmpsim/avaya-vsp-4450gsx-pwr.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|VSP-4450GSX-PWR+
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2272.206
diff --git a/tests/snmpsim/avaya-vsp-4850gts-pwr.snmprec b/tests/snmpsim/avaya-vsp-4850gts-pwr.snmprec
new file mode 100644
index 0000000000..f569e257c3
--- /dev/null
+++ b/tests/snmpsim/avaya-vsp-4850gts-pwr.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|VSP-4850GTS-PWR+
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2272.203
diff --git a/tests/snmpsim/avaya-vsp-4850gts.snmprec b/tests/snmpsim/avaya-vsp-4850gts.snmprec
new file mode 100644
index 0000000000..b3408346f8
--- /dev/null
+++ b/tests/snmpsim/avaya-vsp-4850gts.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|VSP-4850GTS
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2272.202
diff --git a/tests/snmpsim/avaya-vsp-7254xsq.snmprec b/tests/snmpsim/avaya-vsp-7254xsq.snmprec
new file mode 100644
index 0000000000..da49fffd25
--- /dev/null
+++ b/tests/snmpsim/avaya-vsp-7254xsq.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|VSP-7254XSQ
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2272.209
diff --git a/tests/snmpsim/avaya-vsp-7254xtq.snmprec b/tests/snmpsim/avaya-vsp-7254xtq.snmprec
new file mode 100644
index 0000000000..6d8571f5ed
--- /dev/null
+++ b/tests/snmpsim/avaya-vsp-7254xtq.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|VSP-7254XTQ
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2272.210
diff --git a/tests/snmpsim/avaya-vsp-8284xsq.snmprec b/tests/snmpsim/avaya-vsp-8284xsq.snmprec
new file mode 100644
index 0000000000..de032c3d82
--- /dev/null
+++ b/tests/snmpsim/avaya-vsp-8284xsq.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|VSP-8284XSQ
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2272.205
diff --git a/tests/snmpsim/avaya-vsp-8404.snmprec b/tests/snmpsim/avaya-vsp-8404.snmprec
new file mode 100644
index 0000000000..d29cb167d8
--- /dev/null
+++ b/tests/snmpsim/avaya-vsp-8404.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|VSP-8404
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2272.208
diff --git a/tests/snmpsim/avocent-alterpath.snmprec b/tests/snmpsim/avocent-alterpath.snmprec
new file mode 100644
index 0000000000..edacb4e05d
--- /dev/null
+++ b/tests/snmpsim/avocent-alterpath.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|AlterPath
diff --git a/tests/snmpsim/avocent.snmprec b/tests/snmpsim/avocent.snmprec
new file mode 100644
index 0000000000..1e52cc5ab7
--- /dev/null
+++ b/tests/snmpsim/avocent.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Avocent
diff --git a/tests/snmpsim/avtech-tempager4e.snmprec b/tests/snmpsim/avtech-tempager4e.snmprec
new file mode 100644
index 0000000000..e413f63034
--- /dev/null
+++ b/tests/snmpsim/avtech-tempager4e.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|TemPageR 4E v4.5.0
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.20916.1.1
diff --git a/tests/snmpsim/axiscam-nve.snmprec b/tests/snmpsim/axiscam-nve.snmprec
new file mode 100644
index 0000000000..87364cc60f
--- /dev/null
+++ b/tests/snmpsim/axiscam-nve.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4| ; AXIS M7011; Network Video Encoder; 5.75.1; Mar 04 2015 10:10; 1FC; 1;
diff --git a/tests/snmpsim/axiscam.snmprec b/tests/snmpsim/axiscam.snmprec
new file mode 100644
index 0000000000..57f6fa7ea3
--- /dev/null
+++ b/tests/snmpsim/axiscam.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4| ; AXIS 221; Network Camera; 4.30; Nov 29 2005 11:18; 141; 1;
diff --git a/tests/snmpsim/axisdocserver.snmprec b/tests/snmpsim/axisdocserver.snmprec
new file mode 100644
index 0000000000..5bc062abcc
--- /dev/null
+++ b/tests/snmpsim/axisdocserver.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|AXIS 1234 Network Document Server
diff --git a/tests/snmpsim/barracudaloadbalancer-adc.snmprec b/tests/snmpsim/barracudaloadbalancer-adc.snmprec
new file mode 100644
index 0000000000..65928500eb
--- /dev/null
+++ b/tests/snmpsim/barracudaloadbalancer-adc.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Barracuda Load Balancer ADC
diff --git a/tests/snmpsim/barracudaloadbalancer.snmprec b/tests/snmpsim/barracudaloadbalancer.snmprec
new file mode 100644
index 0000000000..d29fcbf2d2
--- /dev/null
+++ b/tests/snmpsim/barracudaloadbalancer.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Barracuda Load Balancer
diff --git a/tests/snmpsim/barracudangfirewall.snmprec b/tests/snmpsim/barracudangfirewall.snmprec
new file mode 100644
index 0000000000..cd5f0bdd1c
--- /dev/null
+++ b/tests/snmpsim/barracudangfirewall.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Barracuda Firewall
diff --git a/tests/snmpsim/barracudaspamfirewall.snmprec b/tests/snmpsim/barracudaspamfirewall.snmprec
new file mode 100644
index 0000000000..c400f934e2
--- /dev/null
+++ b/tests/snmpsim/barracudaspamfirewall.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Barracuda Spam Firewall
diff --git a/tests/snmpsim/bcm963.snmprec b/tests/snmpsim/bcm963.snmprec
new file mode 100644
index 0000000000..b13ee85210
--- /dev/null
+++ b/tests/snmpsim/bcm963.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|bcm963
diff --git a/tests/snmpsim/bdcom.snmprec b/tests/snmpsim/bdcom.snmprec
new file mode 100644
index 0000000000..4281cbe173
--- /dev/null
+++ b/tests/snmpsim/bdcom.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|BDCOM(tm) S2524C Software, Version 2.1.0A Build 5721
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3320.1
diff --git a/tests/snmpsim/binos.snmprec b/tests/snmpsim/binos.snmprec
new file mode 100644
index 0000000000..e18d9039cb
--- /dev/null
+++ b/tests/snmpsim/binos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.738.1.5.100
diff --git a/tests/snmpsim/binox.snmprec b/tests/snmpsim/binox.snmprec
new file mode 100644
index 0000000000..94902e2e3b
--- /dev/null
+++ b/tests/snmpsim/binox.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.738.10.5.100
diff --git a/tests/snmpsim/bintec-smart.snmprec b/tests/snmpsim/bintec-smart.snmprec
new file mode 100644
index 0000000000..f1d4bc55a7
--- /dev/null
+++ b/tests/snmpsim/bintec-smart.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.272.4.201.82.78.79.48
diff --git a/tests/snmpsim/bnt.snmprec b/tests/snmpsim/bnt.snmprec
new file mode 100644
index 0000000000..5e28fa8ff7
--- /dev/null
+++ b/tests/snmpsim/bnt.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Blade Network Technologies
diff --git a/tests/snmpsim/bnt1.snmprec b/tests/snmpsim/bnt1.snmprec
new file mode 100644
index 0000000000..b2c0ad3d17
--- /dev/null
+++ b/tests/snmpsim/bnt1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|BNT Something
diff --git a/tests/snmpsim/brother.snmprec b/tests/snmpsim/brother.snmprec
new file mode 100644
index 0000000000..559d5efae3
--- /dev/null
+++ b/tests/snmpsim/brother.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Brother NC-8300h, Firmware Ver.1.14  (14.11.06),MID 8C5-F01,FID 2
diff --git a/tests/snmpsim/buffalo.snmprec b/tests/snmpsim/buffalo.snmprec
new file mode 100644
index 0000000000..9e2bf03ae5
--- /dev/null
+++ b/tests/snmpsim/buffalo.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|BUFFALO TeraStation TS5400R Ver.3.00 (2015/11/20 18:27:09)
diff --git a/tests/snmpsim/calix-e7-2.snmprec b/tests/snmpsim/calix-e7-2.snmprec
new file mode 100644
index 0000000000..c9e08b74dd
--- /dev/null
+++ b/tests/snmpsim/calix-e7-2.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|E7-2
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6321.1.2.3
diff --git a/tests/snmpsim/calix.snmprec b/tests/snmpsim/calix.snmprec
new file mode 100644
index 0000000000..bacab745f5
--- /dev/null
+++ b/tests/snmpsim/calix.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6321.1.2.2.5.3
diff --git a/tests/snmpsim/calix1.snmprec b/tests/snmpsim/calix1.snmprec
new file mode 100644
index 0000000000..e58b7fe095
--- /dev/null
+++ b/tests/snmpsim/calix1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6066.1.44
diff --git a/tests/snmpsim/cambium-ptp.snmprec b/tests/snmpsim/cambium-ptp.snmprec
new file mode 100644
index 0000000000..ed86f9c4c7
--- /dev/null
+++ b/tests/snmpsim/cambium-ptp.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cambium PTP
diff --git a/tests/snmpsim/cambium-ptp250.snmprec b/tests/snmpsim/cambium-ptp250.snmprec
new file mode 100644
index 0000000000..d9994e935d
--- /dev/null
+++ b/tests/snmpsim/cambium-ptp250.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cambium PTP250
diff --git a/tests/snmpsim/cambium-ptp50650.snmprec b/tests/snmpsim/cambium-ptp50650.snmprec
new file mode 100644
index 0000000000..72463db684
--- /dev/null
+++ b/tests/snmpsim/cambium-ptp50650.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cambium PTP 50650
diff --git a/tests/snmpsim/cambium.snmprec b/tests/snmpsim/cambium.snmprec
new file mode 100644
index 0000000000..ce74afdb58
--- /dev/null
+++ b/tests/snmpsim/cambium.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.17713.21
diff --git a/tests/snmpsim/cambium4.snmprec b/tests/snmpsim/cambium4.snmprec
new file mode 100644
index 0000000000..6bda8cbf81
--- /dev/null
+++ b/tests/snmpsim/cambium4.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|enterprises.17713.21
diff --git a/tests/snmpsim/canonprinter-ir-adv.snmprec b/tests/snmpsim/canonprinter-ir-adv.snmprec
new file mode 100644
index 0000000000..6e745bd0f9
--- /dev/null
+++ b/tests/snmpsim/canonprinter-ir-adv.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Canon iR-ADV
diff --git a/tests/snmpsim/canonprinter-mf.snmprec b/tests/snmpsim/canonprinter-mf.snmprec
new file mode 100644
index 0000000000..849092f2eb
--- /dev/null
+++ b/tests/snmpsim/canonprinter-mf.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Canon MF
diff --git a/tests/snmpsim/canopy-cmm.snmprec b/tests/snmpsim/canopy-cmm.snmprec
new file mode 100644
index 0000000000..28cabdcc26
--- /dev/null
+++ b/tests/snmpsim/canopy-cmm.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|CMM
diff --git a/tests/snmpsim/canopy.snmprec b/tests/snmpsim/canopy.snmprec
new file mode 100644
index 0000000000..3ef6d82278
--- /dev/null
+++ b/tests/snmpsim/canopy.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|CANOPY
diff --git a/tests/snmpsim/cat1900.snmprec b/tests/snmpsim/cat1900.snmprec
new file mode 100644
index 0000000000..bf771ce392
--- /dev/null
+++ b/tests/snmpsim/cat1900.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Systems Catalyst 1900
diff --git a/tests/snmpsim/catos.snmprec b/tests/snmpsim/catos.snmprec
new file mode 100644
index 0000000000..a7b9786df7
--- /dev/null
+++ b/tests/snmpsim/catos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Catalyst Operating System Software
diff --git a/tests/snmpsim/cimc.snmprec b/tests/snmpsim/cimc.snmprec
new file mode 100644
index 0000000000..67abdfe5c2
--- /dev/null
+++ b/tests/snmpsim/cimc.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Integrated Management Controller
diff --git a/tests/snmpsim/ciscosb.snmprec b/tests/snmpsim/ciscosb.snmprec
new file mode 100644
index 0000000000..696bd02747
--- /dev/null
+++ b/tests/snmpsim/ciscosb.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.80
diff --git a/tests/snmpsim/ciscosb1.snmprec b/tests/snmpsim/ciscosb1.snmprec
new file mode 100644
index 0000000000..a1f71ddb9a
--- /dev/null
+++ b/tests/snmpsim/ciscosb1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.81
diff --git a/tests/snmpsim/ciscosb2.snmprec b/tests/snmpsim/ciscosb2.snmprec
new file mode 100644
index 0000000000..ff8c5e92cb
--- /dev/null
+++ b/tests/snmpsim/ciscosb2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.82
diff --git a/tests/snmpsim/ciscosb3.snmprec b/tests/snmpsim/ciscosb3.snmprec
new file mode 100644
index 0000000000..1dc53285b8
--- /dev/null
+++ b/tests/snmpsim/ciscosb3.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.83
diff --git a/tests/snmpsim/ciscosb4.snmprec b/tests/snmpsim/ciscosb4.snmprec
new file mode 100644
index 0000000000..f856fddf3f
--- /dev/null
+++ b/tests/snmpsim/ciscosb4.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.85
diff --git a/tests/snmpsim/ciscosb5.snmprec b/tests/snmpsim/ciscosb5.snmprec
new file mode 100644
index 0000000000..4e3ca5262e
--- /dev/null
+++ b/tests/snmpsim/ciscosb5.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.88
diff --git a/tests/snmpsim/ciscosb6.snmprec b/tests/snmpsim/ciscosb6.snmprec
new file mode 100644
index 0000000000..3828e2eab6
--- /dev/null
+++ b/tests/snmpsim/ciscosb6.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.6.1.89
diff --git a/tests/snmpsim/ciscosmblinux.snmprec b/tests/snmpsim/ciscosmblinux.snmprec
new file mode 100644
index 0000000000..a0f3a876b5
--- /dev/null
+++ b/tests/snmpsim/ciscosmblinux.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux Cisco Small Business
diff --git a/tests/snmpsim/ciscowap.snmprec b/tests/snmpsim/ciscowap.snmprec
new file mode 100644
index 0000000000..ce43c58f8f
--- /dev/null
+++ b/tests/snmpsim/ciscowap.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Small Business WAP
diff --git a/tests/snmpsim/ciscowlc.snmprec b/tests/snmpsim/ciscowlc.snmprec
new file mode 100644
index 0000000000..ad717e4251
--- /dev/null
+++ b/tests/snmpsim/ciscowlc.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Controller
diff --git a/tests/snmpsim/cometsystem-p85xx.snmprec b/tests/snmpsim/cometsystem-p85xx.snmprec
new file mode 100644
index 0000000000..4e9fea0ac8
--- /dev/null
+++ b/tests/snmpsim/cometsystem-p85xx.snmprec
@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Something Firmware Version 10-11-12 Something
+1.3.6.1.4.1.22626.1.5.2.1.3.0|2|1
+
diff --git a/tests/snmpsim/comware-hp-c1234.snmprec b/tests/snmpsim/comware-hp-c1234.snmprec
new file mode 100644
index 0000000000..04a6b9cf85
--- /dev/null
+++ b/tests/snmpsim/comware-hp-c1234.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|HP C1234 Switch Software Version
diff --git a/tests/snmpsim/comware.snmprec b/tests/snmpsim/comware.snmprec
new file mode 100644
index 0000000000..365f72da63
--- /dev/null
+++ b/tests/snmpsim/comware.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Comware
diff --git a/tests/snmpsim/comware1.snmprec b/tests/snmpsim/comware1.snmprec
new file mode 100644
index 0000000000..8c93757cd3
--- /dev/null
+++ b/tests/snmpsim/comware1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.25506.11.1
diff --git a/tests/snmpsim/cucm.snmprec b/tests/snmpsim/cucm.snmprec
new file mode 100644
index 0000000000..d103c5d5cc
--- /dev/null
+++ b/tests/snmpsim/cucm.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.1348
diff --git a/tests/snmpsim/cumulus.snmprec b/tests/snmpsim/cumulus.snmprec
new file mode 100644
index 0000000000..f85dec5e0d
--- /dev/null
+++ b/tests/snmpsim/cumulus.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.40310
diff --git a/tests/snmpsim/datacom.snmprec b/tests/snmpsim/datacom.snmprec
new file mode 100644
index 0000000000..dffc825b8d
--- /dev/null
+++ b/tests/snmpsim/datacom.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3709
diff --git a/tests/snmpsim/datadomain.snmprec b/tests/snmpsim/datadomain.snmprec
new file mode 100644
index 0000000000..d7af1d13db
--- /dev/null
+++ b/tests/snmpsim/datadomain.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.19746.3.1
diff --git a/tests/snmpsim/ddnos.snmprec b/tests/snmpsim/ddnos.snmprec
new file mode 100644
index 0000000000..b2ee94964e
--- /dev/null
+++ b/tests/snmpsim/ddnos.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.4.1.6894.2.30.0|4|1
diff --git a/tests/snmpsim/deliberant.snmprec b/tests/snmpsim/deliberant.snmprec
new file mode 100644
index 0000000000..ca146c9cc5
--- /dev/null
+++ b/tests/snmpsim/deliberant.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Deliberant
diff --git a/tests/snmpsim/dell-laser-color.snmprec b/tests/snmpsim/dell-laser-color.snmprec
new file mode 100644
index 0000000000..1e3abe9425
--- /dev/null
+++ b/tests/snmpsim/dell-laser-color.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Dell Color Laser
diff --git a/tests/snmpsim/dell-laser-mfp.snmprec b/tests/snmpsim/dell-laser-mfp.snmprec
new file mode 100644
index 0000000000..fc85f0766a
--- /dev/null
+++ b/tests/snmpsim/dell-laser-mfp.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Dell something MFP
diff --git a/tests/snmpsim/dell-laser.snmprec b/tests/snmpsim/dell-laser.snmprec
new file mode 100644
index 0000000000..57ece1c63e
--- /dev/null
+++ b/tests/snmpsim/dell-laser.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Dell Laser Printer
diff --git a/tests/snmpsim/deltaups.snmprec b/tests/snmpsim/deltaups.snmprec
new file mode 100644
index 0000000000..aada99510b
--- /dev/null
+++ b/tests/snmpsim/deltaups.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2254.2.4
diff --git a/tests/snmpsim/developprinter.snmprec b/tests/snmpsim/developprinter.snmprec
new file mode 100644
index 0000000000..16bee2f346
--- /dev/null
+++ b/tests/snmpsim/developprinter.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.18334.1.2.1.2.1.50.2.2
diff --git a/tests/snmpsim/dlink-des.snmprec b/tests/snmpsim/dlink-des.snmprec
new file mode 100644
index 0000000000..5a3092a8ee
--- /dev/null
+++ b/tests/snmpsim/dlink-des.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|D-Link DES-
diff --git a/tests/snmpsim/dlink-des1.snmprec b/tests/snmpsim/dlink-des1.snmprec
new file mode 100644
index 0000000000..20ca4d7dc0
--- /dev/null
+++ b/tests/snmpsim/dlink-des1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Dlink DES-
diff --git a/tests/snmpsim/dlink-des2.snmprec b/tests/snmpsim/dlink-des2.snmprec
new file mode 100644
index 0000000000..cf246fa76e
--- /dev/null
+++ b/tests/snmpsim/dlink-des2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|DES-
diff --git a/tests/snmpsim/dlink-dgs.snmprec b/tests/snmpsim/dlink-dgs.snmprec
new file mode 100644
index 0000000000..6409eadfd2
--- /dev/null
+++ b/tests/snmpsim/dlink-dgs.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|DGS-
diff --git a/tests/snmpsim/dlinkap.snmprec b/tests/snmpsim/dlinkap.snmprec
new file mode 100644
index 0000000000..63d09feba8
--- /dev/null
+++ b/tests/snmpsim/dlinkap.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|D-Link Something AP
diff --git a/tests/snmpsim/dlinkap1.snmprec b/tests/snmpsim/dlinkap1.snmprec
new file mode 100644
index 0000000000..b577563129
--- /dev/null
+++ b/tests/snmpsim/dlinkap1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|D-Link DAP-
diff --git a/tests/snmpsim/dlinkap2.snmprec b/tests/snmpsim/dlinkap2.snmprec
new file mode 100644
index 0000000000..61d5de9198
--- /dev/null
+++ b/tests/snmpsim/dlinkap2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|D-Link Access Point
diff --git a/tests/snmpsim/dnos.snmprec b/tests/snmpsim/dnos.snmprec
new file mode 100644
index 0000000000..bf85e2fbf1
--- /dev/null
+++ b/tests/snmpsim/dnos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6027.1.0000000000
diff --git a/tests/snmpsim/dnos1.snmprec b/tests/snmpsim/dnos1.snmprec
new file mode 100644
index 0000000000..e74d0d0619
--- /dev/null
+++ b/tests/snmpsim/dnos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3042
diff --git a/tests/snmpsim/dnos2.snmprec b/tests/snmpsim/dnos2.snmprec
new file mode 100644
index 0000000000..d2de6d84b5
--- /dev/null
+++ b/tests/snmpsim/dnos2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3044
diff --git a/tests/snmpsim/dnos3.snmprec b/tests/snmpsim/dnos3.snmprec
new file mode 100644
index 0000000000..e3cdcaf520
--- /dev/null
+++ b/tests/snmpsim/dnos3.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3054
diff --git a/tests/snmpsim/dnos4.snmprec b/tests/snmpsim/dnos4.snmprec
new file mode 100644
index 0000000000..f68cb8f0ee
--- /dev/null
+++ b/tests/snmpsim/dnos4.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3055
diff --git a/tests/snmpsim/dnos5.snmprec b/tests/snmpsim/dnos5.snmprec
new file mode 100644
index 0000000000..60c9be566b
--- /dev/null
+++ b/tests/snmpsim/dnos5.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3056
diff --git a/tests/snmpsim/dnos6.snmprec b/tests/snmpsim/dnos6.snmprec
new file mode 100644
index 0000000000..f28900bafc
--- /dev/null
+++ b/tests/snmpsim/dnos6.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3046
diff --git a/tests/snmpsim/dnos7.snmprec b/tests/snmpsim/dnos7.snmprec
new file mode 100644
index 0000000000..f81509760c
--- /dev/null
+++ b/tests/snmpsim/dnos7.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3057
diff --git a/tests/snmpsim/dnos8.snmprec b/tests/snmpsim/dnos8.snmprec
new file mode 100644
index 0000000000..52106ef0ef
--- /dev/null
+++ b/tests/snmpsim/dnos8.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3058
diff --git a/tests/snmpsim/dnos9.snmprec b/tests/snmpsim/dnos9.snmprec
new file mode 100644
index 0000000000..35f9a0071a
--- /dev/null
+++ b/tests/snmpsim/dnos9.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3060
diff --git a/tests/snmpsim/drac.snmprec b/tests/snmpsim/drac.snmprec
new file mode 100644
index 0000000000..f7fa39a195
--- /dev/null
+++ b/tests/snmpsim/drac.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Dell Out-of-band SNMP Agent for Remote Access Controller
diff --git a/tests/snmpsim/drac1.snmprec b/tests/snmpsim/drac1.snmprec
new file mode 100644
index 0000000000..7d2398258d
--- /dev/null
+++ b/tests/snmpsim/drac1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10892.2
diff --git a/tests/snmpsim/drac2.snmprec b/tests/snmpsim/drac2.snmprec
new file mode 100644
index 0000000000..12bf5ecf85
--- /dev/null
+++ b/tests/snmpsim/drac2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10892.5
diff --git a/tests/snmpsim/dsm.snmprec b/tests/snmpsim/dsm.snmprec
new file mode 100644
index 0000000000..4032611403
--- /dev/null
+++ b/tests/snmpsim/dsm.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.25.1.4.0|4|syno_hw_version
diff --git a/tests/snmpsim/eaton-5p.snmprec b/tests/snmpsim/eaton-5p.snmprec
new file mode 100644
index 0000000000..dc502a1316
--- /dev/null
+++ b/tests/snmpsim/eaton-5p.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Eaton 5P 2200
diff --git a/tests/snmpsim/eaton-5px.snmprec b/tests/snmpsim/eaton-5px.snmprec
new file mode 100644
index 0000000000..fccdbd107d
--- /dev/null
+++ b/tests/snmpsim/eaton-5px.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Eaton 5PX 2000
diff --git a/tests/snmpsim/eatonpdu.snmprec b/tests/snmpsim/eatonpdu.snmprec
new file mode 100644
index 0000000000..2746e69990
--- /dev/null
+++ b/tests/snmpsim/eatonpdu.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.534.6.6.7
diff --git a/tests/snmpsim/edgeos-erl.snmprec b/tests/snmpsim/edgeos-erl.snmprec
new file mode 100644
index 0000000000..1c3f4408f1
--- /dev/null
+++ b/tests/snmpsim/edgeos-erl.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|EdgeRouter Lite
diff --git a/tests/snmpsim/edgeos.snmprec b/tests/snmpsim/edgeos.snmprec
new file mode 100644
index 0000000000..ff08704c89
--- /dev/null
+++ b/tests/snmpsim/edgeos.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|EdgeOS v1.8.0.4853089.160219.1607
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.41112.1.5
diff --git a/tests/snmpsim/edgeswitch.snmprec b/tests/snmpsim/edgeswitch.snmprec
new file mode 100644
index 0000000000..a2bac44a6a
--- /dev/null
+++ b/tests/snmpsim/edgeswitch.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.4413
diff --git a/tests/snmpsim/endian.snmprec b/tests/snmpsim/endian.snmprec
new file mode 100644
index 0000000000..079b0b03cf
--- /dev/null
+++ b/tests/snmpsim/endian.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux endian
diff --git a/tests/snmpsim/engenius.snmprec b/tests/snmpsim/engenius.snmprec
new file mode 100644
index 0000000000..697180370a
--- /dev/null
+++ b/tests/snmpsim/engenius.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.14125.100.1.3
diff --git a/tests/snmpsim/engenius1.snmprec b/tests/snmpsim/engenius1.snmprec
new file mode 100644
index 0000000000..7d54a5a845
--- /dev/null
+++ b/tests/snmpsim/engenius1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.14125.101.1.3
diff --git a/tests/snmpsim/engenius2.snmprec b/tests/snmpsim/engenius2.snmprec
new file mode 100644
index 0000000000..22a45f938d
--- /dev/null
+++ b/tests/snmpsim/engenius2.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Wireless Access Point
+1.3.6.1.4.1.14125.2.1.1.6.0|4|Something
diff --git a/tests/snmpsim/enterasys.snmprec b/tests/snmpsim/enterasys.snmprec
new file mode 100644
index 0000000000..0ede45ef22
--- /dev/null
+++ b/tests/snmpsim/enterasys.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Enterasys Networks
diff --git a/tests/snmpsim/enterasys1.snmprec b/tests/snmpsim/enterasys1.snmprec
new file mode 100644
index 0000000000..47b6cf8e32
--- /dev/null
+++ b/tests/snmpsim/enterasys1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5624.2.1
diff --git a/tests/snmpsim/epson.snmprec b/tests/snmpsim/epson.snmprec
new file mode 100644
index 0000000000..f4a10b0b39
--- /dev/null
+++ b/tests/snmpsim/epson.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|EPSON Built-in
diff --git a/tests/snmpsim/equallogic.snmprec b/tests/snmpsim/equallogic.snmprec
new file mode 100644
index 0000000000..12521523d3
--- /dev/null
+++ b/tests/snmpsim/equallogic.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12740.17.1
diff --git a/tests/snmpsim/extremeware.snmprec b/tests/snmpsim/extremeware.snmprec
new file mode 100644
index 0000000000..74400ae396
--- /dev/null
+++ b/tests/snmpsim/extremeware.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1916.2
diff --git a/tests/snmpsim/f5.snmprec b/tests/snmpsim/f5.snmprec
new file mode 100644
index 0000000000..62ef03ac86
--- /dev/null
+++ b/tests/snmpsim/f5.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3375.2.1.3.4.1000
diff --git a/tests/snmpsim/fabos.snmprec b/tests/snmpsim/fabos.snmprec
new file mode 100644
index 0000000000..ccea3eb440
--- /dev/null
+++ b/tests/snmpsim/fabos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1588.2.1.1.1
diff --git a/tests/snmpsim/fabos1.snmprec b/tests/snmpsim/fabos1.snmprec
new file mode 100644
index 0000000000..d1b60fb094
--- /dev/null
+++ b/tests/snmpsim/fabos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1588.2.1.1.43
diff --git a/tests/snmpsim/fabos2.snmprec b/tests/snmpsim/fabos2.snmprec
new file mode 100644
index 0000000000..527cea44ac
--- /dev/null
+++ b/tests/snmpsim/fabos2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1588.2.1.1.72
diff --git a/tests/snmpsim/fiberhome-an5516-01.snmprec b/tests/snmpsim/fiberhome-an5516-01.snmprec
new file mode 100644
index 0000000000..2717a8eace
--- /dev/null
+++ b/tests/snmpsim/fiberhome-an5516-01.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|AN5516-01
diff --git a/tests/snmpsim/fiberhome-an5516-06.snmprec b/tests/snmpsim/fiberhome-an5516-06.snmprec
new file mode 100644
index 0000000000..3174401872
--- /dev/null
+++ b/tests/snmpsim/fiberhome-an5516-06.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|AN5516-06
diff --git a/tests/snmpsim/firebox.snmprec b/tests/snmpsim/firebox.snmprec
new file mode 100644
index 0000000000..521a6e1f64
--- /dev/null
+++ b/tests/snmpsim/firebox.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|WatchGuard Fireware
diff --git a/tests/snmpsim/firebox1.snmprec b/tests/snmpsim/firebox1.snmprec
new file mode 100644
index 0000000000..15b492dd40
--- /dev/null
+++ b/tests/snmpsim/firebox1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3097.1.5
diff --git a/tests/snmpsim/fireware-fbx.snmprec b/tests/snmpsim/fireware-fbx.snmprec
new file mode 100644
index 0000000000..123a065e5a
--- /dev/null
+++ b/tests/snmpsim/fireware-fbx.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|FBX Watchguard
diff --git a/tests/snmpsim/fireware-xtm.snmprec b/tests/snmpsim/fireware-xtm.snmprec
new file mode 100644
index 0000000000..c8dccc334d
--- /dev/null
+++ b/tests/snmpsim/fireware-xtm.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|XTM Watchguard 
diff --git a/tests/snmpsim/flareos.snmprec b/tests/snmpsim/flareos.snmprec
new file mode 100644
index 0000000000..e768d9da69
--- /dev/null
+++ b/tests/snmpsim/flareos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1981.1.1
diff --git a/tests/snmpsim/fortigate.snmprec b/tests/snmpsim/fortigate.snmprec
new file mode 100644
index 0000000000..e4a61c4cec
--- /dev/null
+++ b/tests/snmpsim/fortigate.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12356.15
diff --git a/tests/snmpsim/fortigate1.snmprec b/tests/snmpsim/fortigate1.snmprec
new file mode 100644
index 0000000000..57cfd5a086
--- /dev/null
+++ b/tests/snmpsim/fortigate1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12356.101.1
diff --git a/tests/snmpsim/fortios.snmprec b/tests/snmpsim/fortios.snmprec
new file mode 100644
index 0000000000..62520eb67f
--- /dev/null
+++ b/tests/snmpsim/fortios.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12356.103
diff --git a/tests/snmpsim/foundryos.snmprec b/tests/snmpsim/foundryos.snmprec
new file mode 100644
index 0000000000..720be87b0c
--- /dev/null
+++ b/tests/snmpsim/foundryos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Foundry Networks
diff --git a/tests/snmpsim/freebsd.snmprec b/tests/snmpsim/freebsd.snmprec
new file mode 100644
index 0000000000..826392f2a6
--- /dev/null
+++ b/tests/snmpsim/freebsd.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|FreeBSD
diff --git a/tests/snmpsim/ftos.snmprec b/tests/snmpsim/ftos.snmprec
new file mode 100644
index 0000000000..f5e6022f7c
--- /dev/null
+++ b/tests/snmpsim/ftos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Force10 Operating System
diff --git a/tests/snmpsim/fujitsupyos.snmprec b/tests/snmpsim/fujitsupyos.snmprec
new file mode 100644
index 0000000000..a42ced495f
--- /dev/null
+++ b/tests/snmpsim/fujitsupyos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Fujitsu PY CB Eth Switch
diff --git a/tests/snmpsim/fxos.snmprec b/tests/snmpsim/fxos.snmprec
new file mode 100644
index 0000000000..5c52bb44ed
--- /dev/null
+++ b/tests/snmpsim/fxos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco FX-OS
diff --git a/tests/snmpsim/gaia.snmprec b/tests/snmpsim/gaia.snmprec
new file mode 100644
index 0000000000..c58138ee3b
--- /dev/null
+++ b/tests/snmpsim/gaia.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2620.1.6.123.1.49
diff --git a/tests/snmpsim/gamatronicups.snmprec b/tests/snmpsim/gamatronicups.snmprec
new file mode 100644
index 0000000000..160ce08155
--- /dev/null
+++ b/tests/snmpsim/gamatronicups.snmprec
@@ -0,0 +1 @@
+1.3.6.1.4.1.6050.1.1.2.0|4|Gamatronic
diff --git a/tests/snmpsim/hikvision.snmprec b/tests/snmpsim/hikvision.snmprec
new file mode 100644
index 0000000000..dcb99fa432
--- /dev/null
+++ b/tests/snmpsim/hikvision.snmprec
@@ -0,0 +1 @@
+1.3.6.1.4.1.39165.1.6.0|4|Hikvision
diff --git a/tests/snmpsim/hpblmos.snmprec b/tests/snmpsim/hpblmos.snmprec
new file mode 100644
index 0000000000..e5720dbea3
--- /dev/null
+++ b/tests/snmpsim/hpblmos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.5.7.1.2
diff --git a/tests/snmpsim/hpmsm.snmprec b/tests/snmpsim/hpmsm.snmprec
new file mode 100644
index 0000000000..894fa05aaf
--- /dev/null
+++ b/tests/snmpsim/hpmsm.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8744.1
diff --git a/tests/snmpsim/hpvc.snmprec b/tests/snmpsim/hpvc.snmprec
new file mode 100644
index 0000000000..d87e5ccd0c
--- /dev/null
+++ b/tests/snmpsim/hpvc.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.5.7.5.1
diff --git a/tests/snmpsim/huaweiups.snmprec b/tests/snmpsim/huaweiups.snmprec
new file mode 100644
index 0000000000..01d7654d8d
--- /dev/null
+++ b/tests/snmpsim/huaweiups.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux GSE200M
+1.3.6.1.2.1.33.1.1.1.0|4|HUAWEI
diff --git a/tests/snmpsim/hwg-poseidon.snmprec b/tests/snmpsim/hwg-poseidon.snmprec
new file mode 100644
index 0000000000..cc99ea336d
--- /dev/null
+++ b/tests/snmpsim/hwg-poseidon.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.21796.3.3
diff --git a/tests/snmpsim/hwg-ste.snmprec b/tests/snmpsim/hwg-ste.snmprec
new file mode 100644
index 0000000000..f7d5032d46
--- /dev/null
+++ b/tests/snmpsim/hwg-ste.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.21796.4.1
diff --git a/tests/snmpsim/hwg-ste2.snmprec b/tests/snmpsim/hwg-ste2.snmprec
new file mode 100644
index 0000000000..508e804c5c
--- /dev/null
+++ b/tests/snmpsim/hwg-ste2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.21796.4.9
diff --git a/tests/snmpsim/hytera.snmprec b/tests/snmpsim/hytera.snmprec
new file mode 100644
index 0000000000..cbe5ba3bfc
--- /dev/null
+++ b/tests/snmpsim/hytera.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.26381
diff --git a/tests/snmpsim/ibm-amm.snmprec b/tests/snmpsim/ibm-amm.snmprec
new file mode 100644
index 0000000000..5e02b03123
--- /dev/null
+++ b/tests/snmpsim/ibm-amm.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|BladeCenter Advanced Management Module
diff --git a/tests/snmpsim/ibm-imm.snmprec b/tests/snmpsim/ibm-imm.snmprec
new file mode 100644
index 0000000000..5a9fa78a4c
--- /dev/null
+++ b/tests/snmpsim/ibm-imm.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2.3.51.3
diff --git a/tests/snmpsim/ibmnos-flex.snmprec b/tests/snmpsim/ibmnos-flex.snmprec
new file mode 100644
index 0000000000..267a5cf1eb
--- /dev/null
+++ b/tests/snmpsim/ibmnos-flex.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|IBM Flex System Fabric
diff --git a/tests/snmpsim/ibmnos.snmprec b/tests/snmpsim/ibmnos.snmprec
new file mode 100644
index 0000000000..9c79fa549d
--- /dev/null
+++ b/tests/snmpsim/ibmnos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|IBM Networking Operating System
diff --git a/tests/snmpsim/ibmnos1.snmprec b/tests/snmpsim/ibmnos1.snmprec
new file mode 100644
index 0000000000..a9be5c80c8
--- /dev/null
+++ b/tests/snmpsim/ibmnos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|IBM Networking OS
diff --git a/tests/snmpsim/ibmtl.snmprec b/tests/snmpsim/ibmtl.snmprec
new file mode 100644
index 0000000000..df8215f826
--- /dev/null
+++ b/tests/snmpsim/ibmtl.snmprec
@@ -0,0 +1 @@
+1.3.6.1.4.1.2.6.182.3.3.1.0|4|IBM System Storage TS3500 Tape Library
diff --git a/tests/snmpsim/ies.snmprec b/tests/snmpsim/ies.snmprec
new file mode 100644
index 0000000000..220bd4051e
--- /dev/null
+++ b/tests/snmpsim/ies.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|IES-
diff --git a/tests/snmpsim/infinity.snmprec b/tests/snmpsim/infinity.snmprec
new file mode 100644
index 0000000000..feebf5bee3
--- /dev/null
+++ b/tests/snmpsim/infinity.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|NFT 2N
diff --git a/tests/snmpsim/informos.snmprec b/tests/snmpsim/informos.snmprec
new file mode 100644
index 0000000000..8dab34a6f4
--- /dev/null
+++ b/tests/snmpsim/informos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12925.1
diff --git a/tests/snmpsim/ios-c3825.snmprec b/tests/snmpsim/ios-c3825.snmprec
new file mode 100644
index 0000000000..c53961dd77
--- /dev/null
+++ b/tests/snmpsim/ios-c3825.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco IOS Software, 3800 Software (C3825-ADVIPSERVICESK9-M), Version 12.4(22)T5, RELEASE SOFTWARE (fc3) Technical Support: http://www.cisco.com/techsupport Copyright (c) 1986-2010 by Cisco Systems, Inc. Compiled Wed 28-Apr-10 11:30 by prod_rel_team
diff --git a/tests/snmpsim/ios.snmprec b/tests/snmpsim/ios.snmprec
new file mode 100644
index 0000000000..6598f8310d
--- /dev/null
+++ b/tests/snmpsim/ios.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Internetwork Operating System Software IOS (tm) s72033_rp Software (s72033_rp-PS-M), Version 12.2(18)SXD7, RELEASE SOFTWARE (fc1) Technical Support: http://www.cisco.com/techsupport Copyright (c) 1986-2005 by cisco Systems, Inc. Compiled Tue 13
diff --git a/tests/snmpsim/ios1.snmprec b/tests/snmpsim/ios1.snmprec
new file mode 100644
index 0000000000..8860699aff
--- /dev/null
+++ b/tests/snmpsim/ios1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|IOS (tm)
diff --git a/tests/snmpsim/ios2.snmprec b/tests/snmpsim/ios2.snmprec
new file mode 100644
index 0000000000..ef1e4624dd
--- /dev/null
+++ b/tests/snmpsim/ios2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Global Site Selector
diff --git a/tests/snmpsim/iosxe.snmprec b/tests/snmpsim/iosxe.snmprec
new file mode 100644
index 0000000000..fd07471533
--- /dev/null
+++ b/tests/snmpsim/iosxe.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S, RELEASE SOFTWARE (fc1) Technical Support: http://www.cisco.com/techsupport Copyright (c) 1986-2011 by Cisco Systems, Inc. Compiled Thu 21-Jul-11 21:59 by mcpre
diff --git a/tests/snmpsim/iosxr.snmprec b/tests/snmpsim/iosxr.snmprec
new file mode 100644
index 0000000000..e45293a293
--- /dev/null
+++ b/tests/snmpsim/iosxr.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|IOS XR
diff --git a/tests/snmpsim/ipoman.snmprec b/tests/snmpsim/ipoman.snmprec
new file mode 100644
index 0000000000..977820f9c4
--- /dev/null
+++ b/tests/snmpsim/ipoman.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2468.1.4.2.1
diff --git a/tests/snmpsim/ironware.snmprec b/tests/snmpsim/ironware.snmprec
new file mode 100644
index 0000000000..77ebb9462a
--- /dev/null
+++ b/tests/snmpsim/ironware.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|IronWare
diff --git a/tests/snmpsim/ise.snmprec b/tests/snmpsim/ise.snmprec
new file mode 100644
index 0000000000..4458e71005
--- /dev/null
+++ b/tests/snmpsim/ise.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.2139
diff --git a/tests/snmpsim/ise1.snmprec b/tests/snmpsim/ise1.snmprec
new file mode 100644
index 0000000000..ba4bd63cfa
--- /dev/null
+++ b/tests/snmpsim/ise1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.1426
diff --git a/tests/snmpsim/jetdirect.snmprec b/tests/snmpsim/jetdirect.snmprec
new file mode 100644
index 0000000000..363be1908f
--- /dev/null
+++ b/tests/snmpsim/jetdirect.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|JETDIRECT
diff --git a/tests/snmpsim/jetdirect1.snmprec b/tests/snmpsim/jetdirect1.snmprec
new file mode 100644
index 0000000000..b83f20a28f
--- /dev/null
+++ b/tests/snmpsim/jetdirect1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|HP ETHERNET MULTI-ENVIRONMENT
diff --git a/tests/snmpsim/jetdirect2.snmprec b/tests/snmpsim/jetdirect2.snmprec
new file mode 100644
index 0000000000..cd13b02066
--- /dev/null
+++ b/tests/snmpsim/jetdirect2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.1
diff --git a/tests/snmpsim/juniperex2500os.snmprec b/tests/snmpsim/juniperex2500os.snmprec
new file mode 100644
index 0000000000..965cfbff22
--- /dev/null
+++ b/tests/snmpsim/juniperex2500os.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1411.102
diff --git a/tests/snmpsim/junos.snmprec b/tests/snmpsim/junos.snmprec
new file mode 100644
index 0000000000..c0529fbf5a
--- /dev/null
+++ b/tests/snmpsim/junos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2636
diff --git a/tests/snmpsim/junos1.snmprec b/tests/snmpsim/junos1.snmprec
new file mode 100644
index 0000000000..3cd802d77c
--- /dev/null
+++ b/tests/snmpsim/junos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|kernel JUNOS
diff --git a/tests/snmpsim/junose.snmprec b/tests/snmpsim/junose.snmprec
new file mode 100644
index 0000000000..7c72d45bf1
--- /dev/null
+++ b/tests/snmpsim/junose.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.4874
diff --git a/tests/snmpsim/jwos.snmprec b/tests/snmpsim/jwos.snmprec
new file mode 100644
index 0000000000..494dbf91db
--- /dev/null
+++ b/tests/snmpsim/jwos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8239.1.2.9
diff --git a/tests/snmpsim/konica.snmprec b/tests/snmpsim/konica.snmprec
new file mode 100644
index 0000000000..d9a6c3aec8
--- /dev/null
+++ b/tests/snmpsim/konica.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|KONICA MINOLTA Something
diff --git a/tests/snmpsim/kyocera.snmprec b/tests/snmpsim/kyocera.snmprec
new file mode 100644
index 0000000000..9facbc5e31
--- /dev/null
+++ b/tests/snmpsim/kyocera.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|KYOCERA Something
diff --git a/tests/snmpsim/lanier.snmprec b/tests/snmpsim/lanier.snmprec
new file mode 100644
index 0000000000..95079a7875
--- /dev/null
+++ b/tests/snmpsim/lanier.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|LANIER 
diff --git a/tests/snmpsim/lantronix-slc.snmprec b/tests/snmpsim/lantronix-slc.snmprec
new file mode 100644
index 0000000000..932065c01c
--- /dev/null
+++ b/tests/snmpsim/lantronix-slc.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.244.1.1
diff --git a/tests/snmpsim/lenovoemc.snmprec b/tests/snmpsim/lenovoemc.snmprec
new file mode 100644
index 0000000000..d1d1cc66c3
--- /dev/null
+++ b/tests/snmpsim/lenovoemc.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|EMC SOHO-NAS Storage.
diff --git a/tests/snmpsim/lexmarkprinter.snmprec b/tests/snmpsim/lexmarkprinter.snmprec
new file mode 100644
index 0000000000..9f461a187a
--- /dev/null
+++ b/tests/snmpsim/lexmarkprinter.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Lexmark Something
diff --git a/tests/snmpsim/liebert.snmprec b/tests/snmpsim/liebert.snmprec
new file mode 100644
index 0000000000..285847f739
--- /dev/null
+++ b/tests/snmpsim/liebert.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.476.1.42
diff --git a/tests/snmpsim/ligoos.snmprec b/tests/snmpsim/ligoos.snmprec
new file mode 100644
index 0000000000..b4b4e0a062
--- /dev/null
+++ b/tests/snmpsim/ligoos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|LigoPTP
diff --git a/tests/snmpsim/linux.snmprec b/tests/snmpsim/linux.snmprec
new file mode 100644
index 0000000000..3f0490638a
--- /dev/null
+++ b/tests/snmpsim/linux.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux
diff --git a/tests/snmpsim/linux1.snmprec b/tests/snmpsim/linux1.snmprec
new file mode 100644
index 0000000000..3f0490638a
--- /dev/null
+++ b/tests/snmpsim/linux1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux
diff --git a/tests/snmpsim/macosx-sierra.snmprec b/tests/snmpsim/macosx-sierra.snmprec
new file mode 100644
index 0000000000..1b1364ee1c
--- /dev/null
+++ b/tests/snmpsim/macosx-sierra.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Darwin Kernel Version 16
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.255
diff --git a/tests/snmpsim/macosx.snmprec b/tests/snmpsim/macosx.snmprec
new file mode 100644
index 0000000000..67690748ba
--- /dev/null
+++ b/tests/snmpsim/macosx.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Darwin Kernel Version 15
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9999999.3.2.16
diff --git a/tests/snmpsim/mellanox.snmprec b/tests/snmpsim/mellanox.snmprec
new file mode 100644
index 0000000000..eff4cf1c5e
--- /dev/null
+++ b/tests/snmpsim/mellanox.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.33049.1.1.1.1111111111
diff --git a/tests/snmpsim/merakimr.snmprec b/tests/snmpsim/merakimr.snmprec
new file mode 100644
index 0000000000..71a8eccd82
--- /dev/null
+++ b/tests/snmpsim/merakimr.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Meraki MR
diff --git a/tests/snmpsim/merakims.snmprec b/tests/snmpsim/merakims.snmprec
new file mode 100644
index 0000000000..1087d98e2d
--- /dev/null
+++ b/tests/snmpsim/merakims.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Meraki MS
diff --git a/tests/snmpsim/merakimx.snmprec b/tests/snmpsim/merakimx.snmprec
new file mode 100644
index 0000000000..cf762e2eeb
--- /dev/null
+++ b/tests/snmpsim/merakimx.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Meraki MX
diff --git a/tests/snmpsim/mgepdu.snmprec b/tests/snmpsim/mgepdu.snmprec
new file mode 100644
index 0000000000..18c236d9af
--- /dev/null
+++ b/tests/snmpsim/mgepdu.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|MGE Switched PDU
diff --git a/tests/snmpsim/mgeups-evolution.snmprec b/tests/snmpsim/mgeups-evolution.snmprec
new file mode 100644
index 0000000000..f727e75ee6
--- /dev/null
+++ b/tests/snmpsim/mgeups-evolution.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Evolution Something
diff --git a/tests/snmpsim/mgeups-galaxy.snmprec b/tests/snmpsim/mgeups-galaxy.snmprec
new file mode 100644
index 0000000000..93dc774b6c
--- /dev/null
+++ b/tests/snmpsim/mgeups-galaxy.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Galaxy Something
diff --git a/tests/snmpsim/mgeups-proxy.snmprec b/tests/snmpsim/mgeups-proxy.snmprec
new file mode 100644
index 0000000000..7caca5e4d4
--- /dev/null
+++ b/tests/snmpsim/mgeups-proxy.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|MGE UPS SYSTEMS - Network Management Proxy
diff --git a/tests/snmpsim/mgeups-pulsar.snmprec b/tests/snmpsim/mgeups-pulsar.snmprec
new file mode 100644
index 0000000000..04c57640f0
--- /dev/null
+++ b/tests/snmpsim/mgeups-pulsar.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Pulsar M
diff --git a/tests/snmpsim/microsemitime.snmprec b/tests/snmpsim/microsemitime.snmprec
new file mode 100644
index 0000000000..fdbe69a1a6
--- /dev/null
+++ b/tests/snmpsim/microsemitime.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.39165.1.6
diff --git a/tests/snmpsim/minkelsrms.snmprec b/tests/snmpsim/minkelsrms.snmprec
new file mode 100644
index 0000000000..83f71b7373
--- /dev/null
+++ b/tests/snmpsim/minkelsrms.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|8VD-X20
diff --git a/tests/snmpsim/monowall.snmprec b/tests/snmpsim/monowall.snmprec
new file mode 100644
index 0000000000..7c4a791c59
--- /dev/null
+++ b/tests/snmpsim/monowall.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|m0n0wall
diff --git a/tests/snmpsim/mrvld.snmprec b/tests/snmpsim/mrvld.snmprec
new file mode 100644
index 0000000000..8674eab04f
--- /dev/null
+++ b/tests/snmpsim/mrvld.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|LambdaDriver
diff --git a/tests/snmpsim/multimatic.snmprec b/tests/snmpsim/multimatic.snmprec
new file mode 100644
index 0000000000..fee593a920
--- /dev/null
+++ b/tests/snmpsim/multimatic.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|CS121 
+1.3.6.1.2.1.33.1.1.1.0|4|Multimatic
diff --git a/tests/snmpsim/multimatic1.snmprec b/tests/snmpsim/multimatic1.snmprec
new file mode 100644
index 0000000000..bf30cbbc01
--- /dev/null
+++ b/tests/snmpsim/multimatic1.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|CS121
+1.3.6.1.2.1.33.1.1.1.0|4|S2S
diff --git a/tests/snmpsim/mypoweros.snmprec b/tests/snmpsim/mypoweros.snmprec
new file mode 100644
index 0000000000..d9acea59fb
--- /dev/null
+++ b/tests/snmpsim/mypoweros.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5651.1.102.21
diff --git a/tests/snmpsim/netapp.snmprec b/tests/snmpsim/netapp.snmprec
new file mode 100644
index 0000000000..e947f730e4
--- /dev/null
+++ b/tests/snmpsim/netapp.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|NetApp
diff --git a/tests/snmpsim/netbotz-2014.snmprec b/tests/snmpsim/netbotz-2014.snmprec
new file mode 100644
index 0000000000..c9d285b4e8
--- /dev/null
+++ b/tests/snmpsim/netbotz-2014.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5528.100.20.10.2014
diff --git a/tests/snmpsim/netbotz-2016.snmprec b/tests/snmpsim/netbotz-2016.snmprec
new file mode 100644
index 0000000000..3d89177f7b
--- /dev/null
+++ b/tests/snmpsim/netbotz-2016.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5528.100.20.10.2016
diff --git a/tests/snmpsim/netbsd.snmprec b/tests/snmpsim/netbsd.snmprec
new file mode 100644
index 0000000000..67ccee5f0f
--- /dev/null
+++ b/tests/snmpsim/netbsd.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|NetBSD
diff --git a/tests/snmpsim/netgear.snmprec b/tests/snmpsim/netgear.snmprec
new file mode 100644
index 0000000000..107e1550fe
--- /dev/null
+++ b/tests/snmpsim/netgear.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|ProSafe
diff --git a/tests/snmpsim/netgear1.snmprec b/tests/snmpsim/netgear1.snmprec
new file mode 100644
index 0000000000..26db1ef0d7
--- /dev/null
+++ b/tests/snmpsim/netgear1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.4526
diff --git a/tests/snmpsim/netmanplus.snmprec b/tests/snmpsim/netmanplus.snmprec
new file mode 100644
index 0000000000..89a906db13
--- /dev/null
+++ b/tests/snmpsim/netmanplus.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|NetMan something plus
diff --git a/tests/snmpsim/netmanplus1.snmprec b/tests/snmpsim/netmanplus1.snmprec
new file mode 100644
index 0000000000..b0159f1d55
--- /dev/null
+++ b/tests/snmpsim/netmanplus1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5491.6
diff --git a/tests/snmpsim/netonix-wispswitch.snmprec b/tests/snmpsim/netonix-wispswitch.snmprec
new file mode 100644
index 0000000000..5151adf545
--- /dev/null
+++ b/tests/snmpsim/netonix-wispswitch.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Netonix WS-12-250-AC
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.46242
diff --git a/tests/snmpsim/netopia.snmprec b/tests/snmpsim/netopia.snmprec
new file mode 100644
index 0000000000..f71e77385f
--- /dev/null
+++ b/tests/snmpsim/netopia.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Netopia Something
diff --git a/tests/snmpsim/netscaler.snmprec b/tests/snmpsim/netscaler.snmprec
new file mode 100644
index 0000000000..d63801347a
--- /dev/null
+++ b/tests/snmpsim/netscaler.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5951.1
diff --git a/tests/snmpsim/netvision.snmprec b/tests/snmpsim/netvision.snmprec
new file mode 100644
index 0000000000..63759c1799
--- /dev/null
+++ b/tests/snmpsim/netvision.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Net Vision
diff --git a/tests/snmpsim/netware.snmprec b/tests/snmpsim/netware.snmprec
new file mode 100644
index 0000000000..9fe426dd91
--- /dev/null
+++ b/tests/snmpsim/netware.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Novell NetWare
diff --git a/tests/snmpsim/nimbleos.snmprec b/tests/snmpsim/nimbleos.snmprec
new file mode 100644
index 0000000000..e7b57db026
--- /dev/null
+++ b/tests/snmpsim/nimbleos.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Nimble Storage nw-group-01 running software version 2.3.14.0-325711-opt
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.37447.3.1
diff --git a/tests/snmpsim/nios-ipam.snmprec b/tests/snmpsim/nios-ipam.snmprec
new file mode 100644
index 0000000000..733c18a52c
--- /dev/null
+++ b/tests/snmpsim/nios-ipam.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|IPAM
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.7779.1.1004
diff --git a/tests/snmpsim/nios.snmprec b/tests/snmpsim/nios.snmprec
new file mode 100644
index 0000000000..4283ebf5e4
--- /dev/null
+++ b/tests/snmpsim/nios.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux 3.14.25 #1 SMP Thu Jun 16 18:19:37 EDT 2016 x86_64
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.7779.1.1402
diff --git a/tests/snmpsim/nitro.snmprec b/tests/snmpsim/nitro.snmprec
new file mode 100644
index 0000000000..f14c12844f
--- /dev/null
+++ b/tests/snmpsim/nitro.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.23128.1000.1.1
diff --git a/tests/snmpsim/nitro1.snmprec b/tests/snmpsim/nitro1.snmprec
new file mode 100644
index 0000000000..f66cf3bf6b
--- /dev/null
+++ b/tests/snmpsim/nitro1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.23128.1000.3.1
diff --git a/tests/snmpsim/nitro2.snmprec b/tests/snmpsim/nitro2.snmprec
new file mode 100644
index 0000000000..d5085d4747
--- /dev/null
+++ b/tests/snmpsim/nitro2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.23128.1000.7.1
diff --git a/tests/snmpsim/nitro3.snmprec b/tests/snmpsim/nitro3.snmprec
new file mode 100644
index 0000000000..27badb7b4b
--- /dev/null
+++ b/tests/snmpsim/nitro3.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.23128.1000.11.1
diff --git a/tests/snmpsim/nos.snmprec b/tests/snmpsim/nos.snmprec
new file mode 100644
index 0000000000..839dd0ca70
--- /dev/null
+++ b/tests/snmpsim/nos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Brocade VDX
diff --git a/tests/snmpsim/nos1.snmprec b/tests/snmpsim/nos1.snmprec
new file mode 100644
index 0000000000..3d0476a652
--- /dev/null
+++ b/tests/snmpsim/nos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|BR-VDX
diff --git a/tests/snmpsim/nos2.snmprec b/tests/snmpsim/nos2.snmprec
new file mode 100644
index 0000000000..466c006759
--- /dev/null
+++ b/tests/snmpsim/nos2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|VDX67
diff --git a/tests/snmpsim/nrg.snmprec b/tests/snmpsim/nrg.snmprec
new file mode 100644
index 0000000000..090daf7999
--- /dev/null
+++ b/tests/snmpsim/nrg.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|NRG Network Printer
diff --git a/tests/snmpsim/nxos.snmprec b/tests/snmpsim/nxos.snmprec
new file mode 100644
index 0000000000..a7abf4eaf8
--- /dev/null
+++ b/tests/snmpsim/nxos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco NX-OS(tm) n3000, Software (n3000-uk9), Version 6.0(2)U1(1a), RELEASE SOFTWARE Copyright (c) 2002-2012 by Cisco Systems, Inc. Device Manager Version nms.sro not found, Compiled 7/1/2013 22:00:00
diff --git a/tests/snmpsim/okilan.snmprec b/tests/snmpsim/okilan.snmprec
new file mode 100644
index 0000000000..5fa9187381
--- /dev/null
+++ b/tests/snmpsim/okilan.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|OKI OkiLAN
diff --git a/tests/snmpsim/onefs.snmprec b/tests/snmpsim/onefs.snmprec
new file mode 100644
index 0000000000..bda4e3b6c4
--- /dev/null
+++ b/tests/snmpsim/onefs.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.12124.1
diff --git a/tests/snmpsim/ons.snmprec b/tests/snmpsim/ons.snmprec
new file mode 100644
index 0000000000..621b41a7aa
--- /dev/null
+++ b/tests/snmpsim/ons.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco ONS
diff --git a/tests/snmpsim/openbsd.snmprec b/tests/snmpsim/openbsd.snmprec
new file mode 100644
index 0000000000..d4ed444236
--- /dev/null
+++ b/tests/snmpsim/openbsd.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.30155.23.1
diff --git a/tests/snmpsim/openbsd1.snmprec b/tests/snmpsim/openbsd1.snmprec
new file mode 100644
index 0000000000..c84d2ea5c4
--- /dev/null
+++ b/tests/snmpsim/openbsd1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|OpenBSD
diff --git a/tests/snmpsim/opensolaris.snmprec b/tests/snmpsim/opensolaris.snmprec
new file mode 100644
index 0000000000..d86a6bfff4
--- /dev/null
+++ b/tests/snmpsim/opensolaris.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SunOS Something 5.11
diff --git a/tests/snmpsim/oracle-ilom.snmprec b/tests/snmpsim/oracle-ilom.snmprec
new file mode 100644
index 0000000000..9717a76f93
--- /dev/null
+++ b/tests/snmpsim/oracle-ilom.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.42.2.200.2.1.1
diff --git a/tests/snmpsim/packetshaper.snmprec b/tests/snmpsim/packetshaper.snmprec
new file mode 100644
index 0000000000..0dc39892f5
--- /dev/null
+++ b/tests/snmpsim/packetshaper.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|PacketShaper
diff --git a/tests/snmpsim/panos.snmprec b/tests/snmpsim/panos.snmprec
new file mode 100644
index 0000000000..bf1c6e98fd
--- /dev/null
+++ b/tests/snmpsim/panos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Palo Alto Networks
diff --git a/tests/snmpsim/papouch-tme.snmprec b/tests/snmpsim/papouch-tme.snmprec
new file mode 100644
index 0000000000..bd3991c81d
--- /dev/null
+++ b/tests/snmpsim/papouch-tme.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SNMP TME
diff --git a/tests/snmpsim/papouch-tme1.snmprec b/tests/snmpsim/papouch-tme1.snmprec
new file mode 100644
index 0000000000..934eeb47dd
--- /dev/null
+++ b/tests/snmpsim/papouch-tme1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|TME
diff --git a/tests/snmpsim/pbn.snmprec b/tests/snmpsim/pbn.snmprec
new file mode 100644
index 0000000000..2ea938253e
--- /dev/null
+++ b/tests/snmpsim/pbn.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11606
diff --git a/tests/snmpsim/pcoweb.snmprec b/tests/snmpsim/pcoweb.snmprec
new file mode 100644
index 0000000000..45d3b31924
--- /dev/null
+++ b/tests/snmpsim/pcoweb.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.4.1.9839.2.1.2.1.0|2|1
diff --git a/tests/snmpsim/perle.snmprec b/tests/snmpsim/perle.snmprec
new file mode 100644
index 0000000000..4b08af15de
--- /dev/null
+++ b/tests/snmpsim/perle.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Perle MCR-MGT
diff --git a/tests/snmpsim/pfsense.snmprec b/tests/snmpsim/pfsense.snmprec
new file mode 100644
index 0000000000..732e08a025
--- /dev/null
+++ b/tests/snmpsim/pfsense.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|pfSense
diff --git a/tests/snmpsim/pixos.snmprec b/tests/snmpsim/pixos.snmprec
new file mode 100644
index 0000000000..43bc1b2622
--- /dev/null
+++ b/tests/snmpsim/pixos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco PIX
diff --git a/tests/snmpsim/pktj.snmprec b/tests/snmpsim/pktj.snmprec
new file mode 100644
index 0000000000..16d8259837
--- /dev/null
+++ b/tests/snmpsim/pktj.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.4.1.26384.1.1.1.1.0.0|70|1
diff --git a/tests/snmpsim/planetos.snmprec b/tests/snmpsim/planetos.snmprec
new file mode 100644
index 0000000000..3290698f4e
--- /dev/null
+++ b/tests/snmpsim/planetos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.10456.1.1516
diff --git a/tests/snmpsim/poweralert.snmprec b/tests/snmpsim/poweralert.snmprec
new file mode 100644
index 0000000000..c21e91cb44
--- /dev/null
+++ b/tests/snmpsim/poweralert.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|POWERALERT
diff --git a/tests/snmpsim/powervault.snmprec b/tests/snmpsim/powervault.snmprec
new file mode 100644
index 0000000000..95906932cc
--- /dev/null
+++ b/tests/snmpsim/powervault.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10893.2.102
diff --git a/tests/snmpsim/powerwalker.snmprec b/tests/snmpsim/powerwalker.snmprec
new file mode 100644
index 0000000000..2ce1165846
--- /dev/null
+++ b/tests/snmpsim/powerwalker.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Network Management Card for UPS
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.935.10
diff --git a/tests/snmpsim/powerware.snmprec b/tests/snmpsim/powerware.snmprec
new file mode 100644
index 0000000000..959f86711f
--- /dev/null
+++ b/tests/snmpsim/powerware.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.534
diff --git a/tests/snmpsim/prestige.snmprec b/tests/snmpsim/prestige.snmprec
new file mode 100644
index 0000000000..95c13fcb8d
--- /dev/null
+++ b/tests/snmpsim/prestige.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Prestige 100
diff --git a/tests/snmpsim/primeinfrastructure.snmprec b/tests/snmpsim/primeinfrastructure.snmprec
new file mode 100644
index 0000000000..e1630c5d54
--- /dev/null
+++ b/tests/snmpsim/primeinfrastructure.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.2307
diff --git a/tests/snmpsim/procera.snmprec b/tests/snmpsim/procera.snmprec
new file mode 100644
index 0000000000..1cd40bfe8c
--- /dev/null
+++ b/tests/snmpsim/procera.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.15397.2
diff --git a/tests/snmpsim/procurve-1820.snmprec b/tests/snmpsim/procurve-1820.snmprec
new file mode 100644
index 0000000000..af2e6138d6
--- /dev/null
+++ b/tests/snmpsim/procurve-1820.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|HP 1820
diff --git a/tests/snmpsim/procurve-2530.snmprec b/tests/snmpsim/procurve-2530.snmprec
new file mode 100644
index 0000000000..f7397fecc0
--- /dev/null
+++ b/tests/snmpsim/procurve-2530.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|HP 2530 Something
diff --git a/tests/snmpsim/procurve-5402r.snmprec b/tests/snmpsim/procurve-5402r.snmprec
new file mode 100644
index 0000000000..a0a7cfa6ac
--- /dev/null
+++ b/tests/snmpsim/procurve-5402r.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|HP 5402R Something
diff --git a/tests/snmpsim/procurve-ecos-100.snmprec b/tests/snmpsim/procurve-ecos-100.snmprec
new file mode 100644
index 0000000000..a18d324e77
--- /dev/null
+++ b/tests/snmpsim/procurve-ecos-100.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|eCos-100
diff --git a/tests/snmpsim/procurve.snmprec b/tests/snmpsim/procurve.snmprec
new file mode 100644
index 0000000000..b756a961cf
--- /dev/null
+++ b/tests/snmpsim/procurve.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|ProCurve
diff --git a/tests/snmpsim/proxim.snmprec b/tests/snmpsim/proxim.snmprec
new file mode 100644
index 0000000000..5971e9a75e
--- /dev/null
+++ b/tests/snmpsim/proxim.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11898.2.4.9
diff --git a/tests/snmpsim/pulse.snmprec b/tests/snmpsim/pulse.snmprec
new file mode 100644
index 0000000000..78d8a6c2bc
--- /dev/null
+++ b/tests/snmpsim/pulse.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Pulse Connect Secure
diff --git a/tests/snmpsim/qnap.snmprec b/tests/snmpsim/qnap.snmprec
new file mode 100644
index 0000000000..2a89cd9187
--- /dev/null
+++ b/tests/snmpsim/qnap.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.47.1.1.1.1.12.1|4|QNAP
diff --git a/tests/snmpsim/quanta.snmprec b/tests/snmpsim/quanta.snmprec
new file mode 100644
index 0000000000..7e970ac2af
--- /dev/null
+++ b/tests/snmpsim/quanta.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|vxworks
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.4413
diff --git a/tests/snmpsim/quanta1.snmprec b/tests/snmpsim/quanta1.snmprec
new file mode 100644
index 0000000000..03d587442a
--- /dev/null
+++ b/tests/snmpsim/quanta1.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|vxworks
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.7244
diff --git a/tests/snmpsim/quanta2.snmprec b/tests/snmpsim/quanta2.snmprec
new file mode 100644
index 0000000000..466d3e1fb7
--- /dev/null
+++ b/tests/snmpsim/quanta2.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Quanta
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.4413
diff --git a/tests/snmpsim/quanta3.snmprec b/tests/snmpsim/quanta3.snmprec
new file mode 100644
index 0000000000..ad99ed846c
--- /dev/null
+++ b/tests/snmpsim/quanta3.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Quanta
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.7244
diff --git a/tests/snmpsim/radlan.snmprec b/tests/snmpsim/radlan.snmprec
new file mode 100644
index 0000000000..c87b80de68
--- /dev/null
+++ b/tests/snmpsim/radlan.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|AT-8000
diff --git a/tests/snmpsim/raisecom.snmprec b/tests/snmpsim/raisecom.snmprec
new file mode 100644
index 0000000000..99a2ffdd2a
--- /dev/null
+++ b/tests/snmpsim/raisecom.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8886
diff --git a/tests/snmpsim/raritan-px2.snmprec b/tests/snmpsim/raritan-px2.snmprec
new file mode 100644
index 0000000000..c775ee6c6a
--- /dev/null
+++ b/tests/snmpsim/raritan-px2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|PX2
diff --git a/tests/snmpsim/raritan.snmprec b/tests/snmpsim/raritan.snmprec
new file mode 100644
index 0000000000..79f3826221
--- /dev/null
+++ b/tests/snmpsim/raritan.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Raritan
diff --git a/tests/snmpsim/redback.snmprec b/tests/snmpsim/redback.snmprec
new file mode 100644
index 0000000000..d889da0867
--- /dev/null
+++ b/tests/snmpsim/redback.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Redback
diff --git a/tests/snmpsim/ricoh-aficio.snmprec b/tests/snmpsim/ricoh-aficio.snmprec
new file mode 100644
index 0000000000..205ff8ba9f
--- /dev/null
+++ b/tests/snmpsim/ricoh-aficio.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|RICOH Aficio
diff --git a/tests/snmpsim/ricoh.snmprec b/tests/snmpsim/ricoh.snmprec
new file mode 100644
index 0000000000..dd2c92f444
--- /dev/null
+++ b/tests/snmpsim/ricoh.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|RICOH Network Printer
diff --git a/tests/snmpsim/riverbed.snmprec b/tests/snmpsim/riverbed.snmprec
new file mode 100644
index 0000000000..352916acba
--- /dev/null
+++ b/tests/snmpsim/riverbed.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.17163.1.1
diff --git a/tests/snmpsim/routeros.snmprec b/tests/snmpsim/routeros.snmprec
new file mode 100644
index 0000000000..0541f6575e
--- /dev/null
+++ b/tests/snmpsim/routeros.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|router
+1.3.6.1.4.1.14988.1.1.4.3.0|2|1
diff --git a/tests/snmpsim/routeros1.snmprec b/tests/snmpsim/routeros1.snmprec
new file mode 100644
index 0000000000..013c31b402
--- /dev/null
+++ b/tests/snmpsim/routeros1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|RouterOS RB2011UiAS
diff --git a/tests/snmpsim/ruckuswireless.snmprec b/tests/snmpsim/ruckuswireless.snmprec
new file mode 100644
index 0000000000..8764f3e09f
--- /dev/null
+++ b/tests/snmpsim/ruckuswireless.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.25053.3.1
diff --git a/tests/snmpsim/saf.snmprec b/tests/snmpsim/saf.snmprec
new file mode 100644
index 0000000000..0e06c0d1da
--- /dev/null
+++ b/tests/snmpsim/saf.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.7571.100.1.1.5
diff --git a/tests/snmpsim/samsungprinter-c.snmprec b/tests/snmpsim/samsungprinter-c.snmprec
new file mode 100644
index 0000000000..612302ffa0
--- /dev/null
+++ b/tests/snmpsim/samsungprinter-c.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Samsung C
diff --git a/tests/snmpsim/samsungprinter-clx.snmprec b/tests/snmpsim/samsungprinter-clx.snmprec
new file mode 100644
index 0000000000..e555781e7c
--- /dev/null
+++ b/tests/snmpsim/samsungprinter-clx.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Samsung CLX
diff --git a/tests/snmpsim/samsungprinter-s.snmprec b/tests/snmpsim/samsungprinter-s.snmprec
new file mode 100644
index 0000000000..315e8ea280
--- /dev/null
+++ b/tests/snmpsim/samsungprinter-s.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Samsung S
diff --git a/tests/snmpsim/samsungprinter-scx.snmprec b/tests/snmpsim/samsungprinter-scx.snmprec
new file mode 100644
index 0000000000..01ee6ce652
--- /dev/null
+++ b/tests/snmpsim/samsungprinter-scx.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Samsung SCX
diff --git a/tests/snmpsim/sanos.snmprec b/tests/snmpsim/sanos.snmprec
new file mode 100644
index 0000000000..2f66244c63
--- /dev/null
+++ b/tests/snmpsim/sanos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SAN-OS
diff --git a/tests/snmpsim/screenos.snmprec b/tests/snmpsim/screenos.snmprec
new file mode 100644
index 0000000000..7636c6f8fe
--- /dev/null
+++ b/tests/snmpsim/screenos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.3224.1
diff --git a/tests/snmpsim/screenos1.snmprec b/tests/snmpsim/screenos1.snmprec
new file mode 100644
index 0000000000..c56753672c
--- /dev/null
+++ b/tests/snmpsim/screenos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3224
diff --git a/tests/snmpsim/sentry3-smart.snmprec b/tests/snmpsim/sentry3-smart.snmprec
new file mode 100644
index 0000000000..ceba57f8c4
--- /dev/null
+++ b/tests/snmpsim/sentry3-smart.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Sentry Smart Something
+1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 7
diff --git a/tests/snmpsim/sentry3-switched.snmprec b/tests/snmpsim/sentry3-switched.snmprec
new file mode 100644
index 0000000000..f0fb767fba
--- /dev/null
+++ b/tests/snmpsim/sentry3-switched.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Sentry Switched Something
+1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 7
diff --git a/tests/snmpsim/sentry4-smart.snmprec b/tests/snmpsim/sentry4-smart.snmprec
new file mode 100644
index 0000000000..6072584daa
--- /dev/null
+++ b/tests/snmpsim/sentry4-smart.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Sentry Smart Something
+1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 8
diff --git a/tests/snmpsim/sentry4-switched.snmprec b/tests/snmpsim/sentry4-switched.snmprec
new file mode 100644
index 0000000000..0bb5ec1425
--- /dev/null
+++ b/tests/snmpsim/sentry4-switched.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Sentry Switched Something
+1.3.6.1.4.1.1718.4.1.1.1.3.0|4|0 8
diff --git a/tests/snmpsim/serveriron.snmprec b/tests/snmpsim/serveriron.snmprec
new file mode 100644
index 0000000000..c7ff638006
--- /dev/null
+++ b/tests/snmpsim/serveriron.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|ServerIron
diff --git a/tests/snmpsim/sharp-mx2614n.snmprec b/tests/snmpsim/sharp-mx2614n.snmprec
new file mode 100644
index 0000000000..aa9cd47116
--- /dev/null
+++ b/tests/snmpsim/sharp-mx2614n.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SHARP MX-2614N
diff --git a/tests/snmpsim/sharp-mx3140n.snmprec b/tests/snmpsim/sharp-mx3140n.snmprec
new file mode 100644
index 0000000000..7dba39ac3e
--- /dev/null
+++ b/tests/snmpsim/sharp-mx3140n.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SHARP MX-3140N
diff --git a/tests/snmpsim/sharp-mxc301w.snmprec b/tests/snmpsim/sharp-mxc301w.snmprec
new file mode 100644
index 0000000000..33b4273403
--- /dev/null
+++ b/tests/snmpsim/sharp-mxc301w.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SHARP MX-C301W
diff --git a/tests/snmpsim/siklu.snmprec b/tests/snmpsim/siklu.snmprec
new file mode 100644
index 0000000000..066cec41d5
--- /dev/null
+++ b/tests/snmpsim/siklu.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.47.1.1.1.1.12.1|4|Siklu
diff --git a/tests/snmpsim/skel.snmprec b/tests/snmpsim/skel.snmprec
new file mode 100644
index 0000000000..984587ea06
--- /dev/null
+++ b/tests/snmpsim/skel.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|
+1.3.6.1.2.1.1.2.0|6|
diff --git a/tests/snmpsim/smartax.snmprec b/tests/snmpsim/smartax.snmprec
new file mode 100644
index 0000000000..cf48cfcbac
--- /dev/null
+++ b/tests/snmpsim/smartax.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Huawei Integrated Access Software
diff --git a/tests/snmpsim/solaris.snmprec b/tests/snmpsim/solaris.snmprec
new file mode 100644
index 0000000000..1b38c3f902
--- /dev/null
+++ b/tests/snmpsim/solaris.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SunOS Something 5.10
diff --git a/tests/snmpsim/solaris1.snmprec b/tests/snmpsim/solaris1.snmprec
new file mode 100644
index 0000000000..344547911a
--- /dev/null
+++ b/tests/snmpsim/solaris1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.42.2.1.1
diff --git a/tests/snmpsim/sonicwall.snmprec b/tests/snmpsim/sonicwall.snmprec
new file mode 100644
index 0000000000..699503bd20
--- /dev/null
+++ b/tests/snmpsim/sonicwall.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SonicWALL
diff --git a/tests/snmpsim/sonus-gsx.snmprec b/tests/snmpsim/sonus-gsx.snmprec
new file mode 100644
index 0000000000..478dc1ece6
--- /dev/null
+++ b/tests/snmpsim/sonus-gsx.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2879.1.1.2
diff --git a/tests/snmpsim/sonus-sbc.snmprec b/tests/snmpsim/sonus-sbc.snmprec
new file mode 100644
index 0000000000..359d59267e
--- /dev/null
+++ b/tests/snmpsim/sonus-sbc.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2879.1.9.2
diff --git a/tests/snmpsim/sonus-sbc1.snmprec b/tests/snmpsim/sonus-sbc1.snmprec
new file mode 100644
index 0000000000..d75c187b36
--- /dev/null
+++ b/tests/snmpsim/sonus-sbc1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.177.15.1.1.1
diff --git a/tests/snmpsim/sophos.snmprec b/tests/snmpsim/sophos.snmprec
new file mode 100644
index 0000000000..9859be723c
--- /dev/null
+++ b/tests/snmpsim/sophos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux g56fa85e
diff --git a/tests/snmpsim/sophos1.snmprec b/tests/snmpsim/sophos1.snmprec
new file mode 100644
index 0000000000..2af69ca496
--- /dev/null
+++ b/tests/snmpsim/sophos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux gc80f187
diff --git a/tests/snmpsim/sophos2.snmprec b/tests/snmpsim/sophos2.snmprec
new file mode 100644
index 0000000000..a18dddf3e0
--- /dev/null
+++ b/tests/snmpsim/sophos2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux g829be90
diff --git a/tests/snmpsim/sophos3.snmprec b/tests/snmpsim/sophos3.snmprec
new file mode 100644
index 0000000000..4c76222a24
--- /dev/null
+++ b/tests/snmpsim/sophos3.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Linux g63c0044
diff --git a/tests/snmpsim/speedtouch-st5000.snmprec b/tests/snmpsim/speedtouch-st5000.snmprec
new file mode 100644
index 0000000000..597ff74c41
--- /dev/null
+++ b/tests/snmpsim/speedtouch-st5000.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|ST5000
diff --git a/tests/snmpsim/speedtouch-tg585.snmprec b/tests/snmpsim/speedtouch-tg585.snmprec
new file mode 100644
index 0000000000..274f279fdc
--- /dev/null
+++ b/tests/snmpsim/speedtouch-tg585.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|TG585v7
diff --git a/tests/snmpsim/speedtouch.snmprec b/tests/snmpsim/speedtouch.snmprec
new file mode 100644
index 0000000000..445548f926
--- /dev/null
+++ b/tests/snmpsim/speedtouch.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SpeedTouch Something
diff --git a/tests/snmpsim/sub10.snmprec b/tests/snmpsim/sub10.snmprec
new file mode 100644
index 0000000000..c3aca2e284
--- /dev/null
+++ b/tests/snmpsim/sub10.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.39003
diff --git a/tests/snmpsim/supermicro-switch-sbm.snmprec b/tests/snmpsim/supermicro-switch-sbm.snmprec
new file mode 100644
index 0000000000..92fd64ec94
--- /dev/null
+++ b/tests/snmpsim/supermicro-switch-sbm.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SBM-
diff --git a/tests/snmpsim/supermicro-switch-sse.snmprec b/tests/snmpsim/supermicro-switch-sse.snmprec
new file mode 100644
index 0000000000..599a8171b3
--- /dev/null
+++ b/tests/snmpsim/supermicro-switch-sse.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|SSE-
diff --git a/tests/snmpsim/supermicro-switch.snmprec b/tests/snmpsim/supermicro-switch.snmprec
new file mode 100644
index 0000000000..cf23b604f3
--- /dev/null
+++ b/tests/snmpsim/supermicro-switch.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Supermicro Switch
diff --git a/tests/snmpsim/swos-rb250gs.snmprec b/tests/snmpsim/swos-rb250gs.snmprec
new file mode 100644
index 0000000000..cafd057861
--- /dev/null
+++ b/tests/snmpsim/swos-rb250gs.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|RB250GS
+1.3.6.1.2.1.1.5.0|4|MikroTik
diff --git a/tests/snmpsim/swos-rb260gs.snmprec b/tests/snmpsim/swos-rb260gs.snmprec
new file mode 100644
index 0000000000..501ec5cdd0
--- /dev/null
+++ b/tests/snmpsim/swos-rb260gs.snmprec
@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|RB260GS
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.14988.2
+1.3.6.1.2.1.1.5.0|4|MikroTik
diff --git a/tests/snmpsim/swos-rb260gsp.snmprec b/tests/snmpsim/swos-rb260gsp.snmprec
new file mode 100644
index 0000000000..708fd99df3
--- /dev/null
+++ b/tests/snmpsim/swos-rb260gsp.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|RB260GSP
+1.3.6.1.2.1.1.5.0|4|MikroTik
diff --git a/tests/snmpsim/symbol.snmprec b/tests/snmpsim/symbol.snmprec
new file mode 100644
index 0000000000..b3d13e6f79
--- /dev/null
+++ b/tests/snmpsim/symbol.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.388
diff --git a/tests/snmpsim/timos.snmprec b/tests/snmpsim/timos.snmprec
new file mode 100644
index 0000000000..b51c2d696b
--- /dev/null
+++ b/tests/snmpsim/timos.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.1.3
diff --git a/tests/snmpsim/timos1.snmprec b/tests/snmpsim/timos1.snmprec
new file mode 100644
index 0000000000..69f3cca36d
--- /dev/null
+++ b/tests/snmpsim/timos1.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.6.2.1.2.2.1111111
diff --git a/tests/snmpsim/timos2.snmprec b/tests/snmpsim/timos2.snmprec
new file mode 100644
index 0000000000..c20f08f59f
--- /dev/null
+++ b/tests/snmpsim/timos2.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.1.6.1
diff --git a/tests/snmpsim/timos3.snmprec b/tests/snmpsim/timos3.snmprec
new file mode 100644
index 0000000000..4e00868164
--- /dev/null
+++ b/tests/snmpsim/timos3.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.6.1.1.2.1111111
diff --git a/tests/snmpsim/timos4.snmprec b/tests/snmpsim/timos4.snmprec
new file mode 100644
index 0000000000..cfc85b0554
--- /dev/null
+++ b/tests/snmpsim/timos4.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.1.9.1
diff --git a/tests/snmpsim/timos5.snmprec b/tests/snmpsim/timos5.snmprec
new file mode 100644
index 0000000000..9abdb53d67
--- /dev/null
+++ b/tests/snmpsim/timos5.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.1.15.111111111
diff --git a/tests/snmpsim/tpconductor.snmprec b/tests/snmpsim/tpconductor.snmprec
new file mode 100644
index 0000000000..ace537fcf9
--- /dev/null
+++ b/tests/snmpsim/tpconductor.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5596.180.6.4.1
diff --git a/tests/snmpsim/tplink.snmprec b/tests/snmpsim/tplink.snmprec
new file mode 100644
index 0000000000..08943a473f
--- /dev/null
+++ b/tests/snmpsim/tplink.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11863.1.1
diff --git a/tests/snmpsim/tranzeo.snmprec b/tests/snmpsim/tranzeo.snmprec
new file mode 100644
index 0000000000..b0ef70d241
--- /dev/null
+++ b/tests/snmpsim/tranzeo.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Tranzeo
diff --git a/tests/snmpsim/unifi.snmprec b/tests/snmpsim/unifi.snmprec
new file mode 100644
index 0000000000..3005d9acc8
--- /dev/null
+++ b/tests/snmpsim/unifi.snmprec
@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.10002.1
+1.2.840.10036.3.1.2.1.3.6|4|UAP
diff --git a/tests/snmpsim/vccodec.snmprec b/tests/snmpsim/vccodec.snmprec
new file mode 100644
index 0000000000..09c4e4b5c1
--- /dev/null
+++ b/tests/snmpsim/vccodec.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5596.150.6.4.1
diff --git a/tests/snmpsim/vcs.snmprec b/tests/snmpsim/vcs.snmprec
new file mode 100644
index 0000000000..4cfec40ae3
--- /dev/null
+++ b/tests/snmpsim/vcs.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5596.130.6.4.1
diff --git a/tests/snmpsim/viprinux.snmprec b/tests/snmpsim/viprinux.snmprec
new file mode 100644
index 0000000000..5b9a2748a6
--- /dev/null
+++ b/tests/snmpsim/viprinux.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Viprinet VPN Router
diff --git a/tests/snmpsim/vmware-esx.snmprec b/tests/snmpsim/vmware-esx.snmprec
new file mode 100644
index 0000000000..368d9f3a7d
--- /dev/null
+++ b/tests/snmpsim/vmware-esx.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|VMware ESX
diff --git a/tests/snmpsim/vmware-vcsa.snmprec b/tests/snmpsim/vmware-vcsa.snmprec
new file mode 100644
index 0000000000..59c4912e14
--- /dev/null
+++ b/tests/snmpsim/vmware-vcsa.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|VMware-vCenter-Server-Appliance
diff --git a/tests/snmpsim/voswall.snmprec b/tests/snmpsim/voswall.snmprec
new file mode 100644
index 0000000000..b5a867415b
--- /dev/null
+++ b/tests/snmpsim/voswall.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Voswall
diff --git a/tests/snmpsim/vrp.snmprec b/tests/snmpsim/vrp.snmprec
new file mode 100644
index 0000000000..8b52029721
--- /dev/null
+++ b/tests/snmpsim/vrp.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|VRP (R) Software
diff --git a/tests/snmpsim/vrp1.snmprec b/tests/snmpsim/vrp1.snmprec
new file mode 100644
index 0000000000..5532b46c96
--- /dev/null
+++ b/tests/snmpsim/vrp1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|VRP Software Version
diff --git a/tests/snmpsim/vrp2.snmprec b/tests/snmpsim/vrp2.snmprec
new file mode 100644
index 0000000000..68fedef10d
--- /dev/null
+++ b/tests/snmpsim/vrp2.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Software Version VRP
diff --git a/tests/snmpsim/vrp3.snmprec b/tests/snmpsim/vrp3.snmprec
new file mode 100644
index 0000000000..8a1da6a4fc
--- /dev/null
+++ b/tests/snmpsim/vrp3.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Versatile Routing Platform Software
diff --git a/tests/snmpsim/vyatta.snmprec b/tests/snmpsim/vyatta.snmprec
new file mode 100644
index 0000000000..d541678411
--- /dev/null
+++ b/tests/snmpsim/vyatta.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Vyatta
diff --git a/tests/snmpsim/vyos-vyatta.snmprec b/tests/snmpsim/vyos-vyatta.snmprec
new file mode 100644
index 0000000000..67532fcd53
--- /dev/null
+++ b/tests/snmpsim/vyos-vyatta.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Vyatta VyOS
diff --git a/tests/snmpsim/vyos.snmprec b/tests/snmpsim/vyos.snmprec
new file mode 100644
index 0000000000..c3814f0bb3
--- /dev/null
+++ b/tests/snmpsim/vyos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|VyOS
diff --git a/tests/snmpsim/vyos1.snmprec b/tests/snmpsim/vyos1.snmprec
new file mode 100644
index 0000000000..73cfe755d3
--- /dev/null
+++ b/tests/snmpsim/vyos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|vyos
diff --git a/tests/snmpsim/waas.snmprec b/tests/snmpsim/waas.snmprec
new file mode 100644
index 0000000000..b63d266f1d
--- /dev/null
+++ b/tests/snmpsim/waas.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Cisco Wide Area Application Services
diff --git a/tests/snmpsim/webpower.snmprec b/tests/snmpsim/webpower.snmprec
new file mode 100644
index 0000000000..e835d088c6
--- /dev/null
+++ b/tests/snmpsim/webpower.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2468.1.2.1
diff --git a/tests/snmpsim/windows.snmprec b/tests/snmpsim/windows.snmprec
new file mode 100644
index 0000000000..9b584aff6d
--- /dev/null
+++ b/tests/snmpsim/windows.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.311.1.1.3
diff --git a/tests/snmpsim/windows1.snmprec b/tests/snmpsim/windows1.snmprec
new file mode 100644
index 0000000000..ddd8d36856
--- /dev/null
+++ b/tests/snmpsim/windows1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Hardware: Intel64 Family 6 Model 28 Stepping 10 AT/AT COMPATIBLE - Software: Windows Version 6.3 (Build 9600 Multiprocessor Free)
diff --git a/tests/snmpsim/wxgoos.snmprec b/tests/snmpsim/wxgoos.snmprec
new file mode 100644
index 0000000000..bc68f1e665
--- /dev/null
+++ b/tests/snmpsim/wxgoos.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|NETOS 6.0
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.901.1
diff --git a/tests/snmpsim/wxgoos1.snmprec b/tests/snmpsim/wxgoos1.snmprec
new file mode 100644
index 0000000000..0203053237
--- /dev/null
+++ b/tests/snmpsim/wxgoos1.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.17373
diff --git a/tests/snmpsim/xerox-docuprint.snmprec b/tests/snmpsim/xerox-docuprint.snmprec
new file mode 100644
index 0000000000..76f0a0c9fd
--- /dev/null
+++ b/tests/snmpsim/xerox-docuprint.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|FUJI XEROX DocuPrint
diff --git a/tests/snmpsim/xerox-phaser.snmprec b/tests/snmpsim/xerox-phaser.snmprec
new file mode 100644
index 0000000000..0f5990b38b
--- /dev/null
+++ b/tests/snmpsim/xerox-phaser.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Xerox Phaser
diff --git a/tests/snmpsim/xerox-workcentre.snmprec b/tests/snmpsim/xerox-workcentre.snmprec
new file mode 100644
index 0000000000..8f15ae8ed0
--- /dev/null
+++ b/tests/snmpsim/xerox-workcentre.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Xerox WorkCentre
diff --git a/tests/snmpsim/xirrus_aos.snmprec b/tests/snmpsim/xirrus_aos.snmprec
new file mode 100644
index 0000000000..bc8c0f34e9
--- /dev/null
+++ b/tests/snmpsim/xirrus_aos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Xirrus ArrayOS
diff --git a/tests/snmpsim/xos.snmprec b/tests/snmpsim/xos.snmprec
new file mode 100644
index 0000000000..9a17328764
--- /dev/null
+++ b/tests/snmpsim/xos.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|XOS
diff --git a/tests/snmpsim/zxr10.snmprec b/tests/snmpsim/zxr10.snmprec
new file mode 100644
index 0000000000..16f275bf93
--- /dev/null
+++ b/tests/snmpsim/zxr10.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|ZTE Ethernet Switch  ZXR10 5250-52TM-H, Version: V2.05.11B23
diff --git a/tests/snmpsim/zynos-es.snmprec b/tests/snmpsim/zynos-es.snmprec
new file mode 100644
index 0000000000..b3133fbecd
--- /dev/null
+++ b/tests/snmpsim/zynos-es.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|ES Something
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.890
diff --git a/tests/snmpsim/zynos-gs.snmprec b/tests/snmpsim/zynos-gs.snmprec
new file mode 100644
index 0000000000..26d12cc063
--- /dev/null
+++ b/tests/snmpsim/zynos-gs.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|GS Something
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.890
diff --git a/tests/snmpsim/zywall.snmprec b/tests/snmpsim/zywall.snmprec
new file mode 100644
index 0000000000..0bbd0efa05
--- /dev/null
+++ b/tests/snmpsim/zywall.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|ZyWALL 2X
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.890.1.15
diff --git a/tests/snmpsim/zyxelnwa.snmprec b/tests/snmpsim/zyxelnwa.snmprec
new file mode 100644
index 0000000000..777280fe90
--- /dev/null
+++ b/tests/snmpsim/zyxelnwa.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|NWA-