New Upstream Snapshot - python-hpilo

Ready changes

Summary

Merged new upstream version: 4.4.3+git20220917.1.2c74f19 (was: 4.4.3).

Resulting package

Built on 2022-11-27T03:24 (took 8m13s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots python-hpilo-docapt install -t fresh-snapshots python3-hpilo

Lintian Result

Diff

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
deleted file mode 100644
index f0e2584..0000000
--- a/.github/workflows/gh-pages.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: github pages
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  deploy:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Build
-        uses: ammaraskar/sphinx-action@master
-        with:
-          pre-build-command: python -mpip install sphinx-rtd-theme
-          docs-folder: "docs/"
-
-      - name: Ship firmware.conf
-        run:
-          sudo cp firmware.conf docs/_build/html
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs/_build/html
-          force_orphan: true
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
deleted file mode 100644
index 4e1ef42..0000000
--- a/.github/workflows/python-publish.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# This workflows will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
-name: Upload Python Package
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  deploy:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
diff --git a/.github/workflows/rpm-publish.yml b/.github/workflows/rpm-publish.yml
deleted file mode 100644
index 278f19b..0000000
--- a/.github/workflows/rpm-publish.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Upload rpm
-
-on:
-  # Run when we have a new release
-  release:
-    types: [created]
-  # Pushes to the copr branch let us tweak the spec file
-  push:
-    branches:
-      - copr
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    container: fedora:latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install dependencies
-      run: |
-        dnf -y install copr-cli python-pip rpmdevtools
-        pip install setuptools wheel
-    - name: Build srpm
-      run: |
-        python3 setup.py sdist
-        rpmdev-setuptree
-        cp dist/*.tar.gz ~/rpmbuild/SOURCES
-        rpmbuild -bs devtools/python-hpilo.spec
-    - name: Upload to copr
-      env:
-        COPR_TOKEN: ${{ secrets.COPR_TOKEN }}
-      run: |
-        mkdir -p "$HOME/.config"
-        echo "$COPR_TOKEN" > "$HOME/.config/copr"
-        copr build --nowait seveas/python-hpilo ~/rpmbuild/SRPMS/*.src.rpm
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d21d1c6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.pyc
-docs/_build
-build
-dist
-MANIFEST
-hp
-firmware
-*.bin
-*.scexe
-.*.sw?
-*.request.tmp
-hpilo_test_debug_output
-.firmware_version_cache
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..d11b06c
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: python-hpilo
+Version: 4.4.3
+Summary: iLO automation from python or shell
+Home-page: http://github.com/seveas/python-hpilo
+Author: Dennis Kaarsemaker
+Author-email: dennis@kaarsemaker.net
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: System :: Hardware
+Classifier: Topic :: System :: Systems Administration
+Classifier: Topic :: System :: Networking
+License-File: COPYING
diff --git a/debian/changelog b/debian/changelog
index e5e844d..5fdef5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-hpilo (4.4.3+git20220917.1.2c74f19-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 27 Nov 2022 03:21:01 -0000
+
 python-hpilo (4.4.3-2) unstable; urgency=medium
 
   * debian/rules
diff --git a/devtools/fix_newlines b/devtools/fix_newlines
deleted file mode 100755
index af7dea9..0000000
--- a/devtools/fix_newlines
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/python
-#
-# Try to reconstruct a saved chunked response after an editor has mangled all
-# the newlines. Not 100% foolproof, but decent enough that the result requires
-# very little manual mangling.
-
-import sys
-import re
-
-data = sys.stdin.read()
-header, body = data.split('\n\n', 1)
-header = header.replace('\n', '\r\n')
-
-# All <?xml ... ?> stanzas end with CRLF. Only match on ?> as the stanza may be split over 2 chunks
-body = body.replace('?>', '?>\r')
-# Chunked response: each chunk ends with CRLF, as does the line with the chunk size
-body = re.sub(r'\n([0-9a-f]{1,3})\n', r'\r\n\1\r\n', body)
-# First chunk. Don't try to match the last newline of a previous chunk.
-body = re.sub('^([0-9a-f]{1,3})\n', r'\1\r\n', body, 1)
-
-print '\r\n\r\n'.join([header, body])
diff --git a/devtools/git-hooks/pre-commit b/devtools/git-hooks/pre-commit
deleted file mode 100755
index 776f7d3..0000000
--- a/devtools/git-hooks/pre-commit
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-die() {
-    echo "(pre-commit) $@" >&2
-    exit 1
-}
-
-# Mistakes I commonly make:
-# - Not bumping *all* versions
-
-# Gesundheit
-versions=$(git show :setup.py :hpilo.py :docs/conf.py | sed -ne  "s/^ *_*\(version\|release\)_* *= *['\"]\([0-9.]*\)['\"].*/\2/p"; sed -ne 's/Version: \(.*\)/\1/p' devtools/python-hpilo.spec)
-if [ $(echo $versions | wc -w) != 5 ]; then
-    die "Yikes. Can't find the versions! (Found: $versions)"
-fi
-if [ $(echo $versions | xargs -n1 echo | uniq | wc -w) != 1 ]; then
-    die "Inconsistent version numbers in setup.py / hpilo.py / docs/conf.py / python-hpilo.spec"
-fi
diff --git a/devtools/git-hooks/pre-push b/devtools/git-hooks/pre-push
deleted file mode 100755
index a70e1e0..0000000
--- a/devtools/git-hooks/pre-push
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-#   <local ref> <local sha1> <remote ref> <remote sha1>
-
-exitcode=0
-die() {
-    echo "(pre-push) $@" >&2
-    exitcode=1
-}
-
-remote="$1"
-url="$2"
-
-z40=0000000000000000000000000000000000000000
-
-IFS=' '
-while read local_ref local_sha remote_ref remote_sha
-do
-    case "$local_ref" in
-    refs/tags/[0-9]*)
-        tag="${local_ref/refs\/tags\//}"
-        # Mistakes I commonly make:
-        # - Not updating CHANGES
-        git show $local_sha:CHANGES | grep -q "^Version $tag" || die "Tag $tag not found in CHANGES"
-        # - Not using an annotated tag
-        test $(git cat-file -t "$local_ref") = "tag" || die "Tag $tag is not annotated"
-        ;;
-    esac
-done
-
-exit $exitcode
diff --git a/devtools/hpilo_mirror b/devtools/hpilo_mirror
deleted file mode 100755
index 5530103..0000000
--- a/devtools/hpilo_mirror
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/usr/bin/python3
-#
-# Mirror the iLO firmware directory and create firmware.conf for the hpilo
-# repository. Not meant to be used by end users.
-#
-# (c) 2011-2021 Dennis Kaarsemaker <dennis@kaarsemaker.net>
-# see COPYING for license details
-
-import configparser
-import ftplib
-import glob
-import io
-import optparse
-import os
-import re
-import requests
-import sys
-import tarfile
-from whelk import Shell
-try:
-    git = Shell(redirect=False, encoding='utf-8').git
-except AttributeError:
-    git = lambda *args: True
-
-def main():
-    p = optparse.OptionParser()
-    p.add_option('-v', '--verbose', dest="verbose", action="store_true", default=False,
-                 help="Be more verbose")
-    p.add_option('-q', '--quiet', dest="quiet", action="count", default=0,
-                 help="no output except errors and updates. Repeat to get only errors")
-    p.add_option('--blank-files', dest='blank_files', action="store_true", default=False,
-                 help="Delete downloaded content after processing")
-    p.add_option('--reset', dest='reset', action="store_true", default=False,
-                 help="Reset git tree to origin/master before mirroring")
-    p.add_option('--fetch', dest='fetch', action="store_true", default=False,
-                 help="Fetch git data before mirroring")
-    p.add_option('--keep', dest='keep', action="store_true", default=False,
-                 help="Keep changes")
-    opts, args = p.parse_args()
-
-    repo = os.path.abspath(os.path.dirname(__file__))
-    repo = git('-C', repo, 'rev-parse', '--show-toplevel', stdout=Shell.PIPE).stdout.strip()
-    os.chdir(repo)
-
-    # Do we need to update?
-    if opts.fetch:
-        git('fetch', '--quiet')
-
-    if opts.reset:
-        git('reset', '--quiet', '--hard', 'origin/master')
-
-    # Abort if there are local changes
-    if not git('diff', '--quiet', '--exit-code', '--', 'firmware.conf'):
-        print("Local changes to firmware.conf, aborting")
-        return
-
-    # Mirror all files and write config
-    ftproot = ('ftp.hp.com', '/pub/softlib2/software1/sc-linux-fw-ilo')
-    conf = os.path.join(repo, 'firmware.conf')
-    root = os.path.join(repo, 'devtools', 'firmware')
-
-    ftp = FTP(ftproot[0], conf=conf, verbosity = 0 if opts.quiet else 2 if opts.verbose else 1, blank_files=opts.blank_files)
-
-    # ftp.login('anonymous','anonymous')
-    # ftp.mirror(ftproot[1], root)
-    resp = requests.get('http://pingtool.org/latest-hp-ilo-firmwares/')
-    ftp.mirror_urls(re.findall('http://downloads.hpe.com[^ "<]*', resp.text), root)
-
-    os.chdir(repo)
-    result = git('diff', '--quiet', '--exit-code', '--', 'firmware.conf')
-    if not result:
-        git('--no-pager', 'diff', '--color=never', '--', 'firmware.conf')
-        if not opts.keep:
-            git('checkout', '--', 'firmware.conf')
-
-class FTP(ftplib.FTP):
-    def __init__(self, *args, **kwargs):
-        self.host = args[0]
-        self.conf = kwargs.pop('conf', None)
-        self.verbosity = kwargs.pop('verbosity', None)
-        self.blank_files = kwargs.pop('blank_files', None)
-        # super(FTP, self).__init__(*args, **kwargs)
-        self.configparser = configparser.ConfigParser()
-        self.configparser.read(self.conf)
-
-    def log(self, level, msg):
-        if self.verbosity >= level:
-            print(msg)
-
-    def mirror(self, remote, local):
-        if not os.path.exists(local):
-            os.mkdir(local)
-        os.chdir(local)
-        self.cwd(remote)
-
-        lines = []
-        self.retrlines('LIST', lines.append)
-        for line in lines:
-            if line.startswith('total'):
-                continue
-            mode, _, _, _, _, _, _, _, name = line.split(None, 8)
-            if name in ('.', '..'):
-                continue
-            if mode.startswith('d'):
-                self.log(1, "Mirroring %s" % name)
-                if os.path.exists(name) and name.startswith('v'):
-                    os.chdir(name)
-                    if glob.glob('*scexe'):
-                        scexe = glob.glob('*.scexe')[0]
-                        self.extract(scexe)
-                        bin = glob.glob('*.bin')[0]
-                        self.add_version("%s/%s" % (remote, name), scexe, bin)
-                    if self.blank_files:
-                        for file in os.listdir('.'):
-                            if os.path.isfile(file):
-                                open(file, 'w').close()
-                    os.chdir('..')
-                    continue
-                self.mirror(os.path.join(remote, name), os.path.join(local, name))
-                if self.blank_files:
-                    for file in os.listdir('.'):
-                        if os.path.isfile(file):
-                            open(file, 'w').close()
-                self.cwd('..')
-                os.chdir('..')
-            else:
-                if not os.path.exists(name):
-                    self.log(1, "Downloading %s" % name)
-                    with open(name, 'wb') as fd:
-                        self.retrbinary('RETR %s' % name, fd.write)
-                if name.endswith('.scexe'):
-                    self.extract(name)
-                    bin = glob.glob('*.bin')[0]
-                    self.add_version(remote, name, bin)
-        for k in sorted(self.configparser._sections.keys()):
-            self.configparser._sections.move_to_end(k)
-        with open(self.conf, 'w') as fd:
-            self.configparser.write(fd)
-
-    def mirror_urls(self, urls, local):
-        if not os.path.exists(local):
-            os.mkdir(local)
-        os.chdir(local)
-
-        for url in urls:
-            path = url.split('/')[-3:]
-            dn = os.sep.join(path[-3:-1])
-            if not os.path.exists(dn):
-                os.makedirs(dn)
-            fn = os.sep.join(path[-3:])
-            if not os.path.exists(fn):
-                self.log(1, "Downloading %s" % url)
-                resp = requests.get(url, stream=True)
-                if resp.status_code != 200:
-                    continue
-                with open(fn, 'wb') as fd:
-                    for chunk in resp.iter_content(chunk_size=4096):
-                        fd.write(chunk)
-            os.chdir(dn)
-
-            if glob.glob('*scexe'):
-                scexe = glob.glob('*.scexe')[0]
-                self.extract(scexe)
-                bin = glob.glob('*.bin')[0]
-                self.add_version(url, scexe, bin)
-
-            if self.blank_files:
-                for file in os.listdir('.'):
-                    if os.path.isfile(file):
-                        open(file, 'w').close()
-                if self.blank_files:
-                    for file in os.listdir('.'):
-                        if os.path.isfile(file):
-                            open(file, 'w').close()
-
-            os.chdir(local)
-
-        for k in sorted(self.configparser._sections.keys()):
-            self.configparser._sections.move_to_end(k)
-        with open(self.conf, 'w') as fd:
-            self.configparser.write(fd)
-
-    def extract(self, name):
-        if glob.glob('*.xml'):
-            return
-        self.log(2, "Processing %s" % name)
-        with open(name, 'rb') as fd:
-            scexe = fd.read()
-        # An scexe is a shell script with an embedded compressed tarball. Find the tarball.
-        skip_start = scexe.index(b'_SKIP=') + 6
-        skip_end = scexe.index(b'\n', skip_start)
-        skip = int(scexe[skip_start:skip_end]) - 1
-        tarball = scexe.split(b'\n', skip)[-1]
-
-        # Now uncompress it
-        if tarball[:2] != b'\x1f\x8b':
-            raise ValueError("Downloaded scexe file %s seems corrupt" % name)
-
-        tf = tarfile.open(fileobj=io.BytesIO(tarball), mode='r:gz')
-        for bf in tf.getnames():
-            self.log(2, " Extracting %s" % bf)
-            tf.extract(bf, '.')
-
-    def add_version(self, remote, scexe, bin):
-        bin = bin.lower()
-        url = remote if remote.startswith('http://') else 'http://%s%s/%s' % (self.host, remote, scexe)
-        if '_' in bin:
-            ilo, version = os.path.splitext(bin)[0].split('_')
-        else:
-            ilo, version = 'ilo', os.path.splitext(bin)[0].replace('ilo', '')
-        version = '%s.%s' % (version[0], version[1:])
-        if version.endswith('j'):
-            return
-        vsection = '%s %s' % (ilo, version)
-        if not self.configparser.has_section(vsection):
-            self.configparser.add_section(vsection)
-            self.configparser.set(vsection, 'version', version)
-            self.configparser.set(vsection, 'url', url)
-            self.configparser.set(vsection, 'file', bin)
-        if not self.configparser.has_section(ilo):
-            self.configparser.add_section(ilo)
-        if self.configparser.has_option(ilo, 'version') and version <= self.configparser.get(ilo, 'version'):
-            return
-        self.log(1, "New %s firmware version: %s (%s)" % (ilo, version, url))
-        self.configparser.set(ilo, 'version', version)
-        self.configparser.set(ilo, 'url', url)
-        self.configparser.set(ilo, 'file', bin)
-
-main()
diff --git a/devtools/python-hpilo.spec b/devtools/python-hpilo.spec
deleted file mode 100644
index 0bbd60a..0000000
--- a/devtools/python-hpilo.spec
+++ /dev/null
@@ -1,38 +0,0 @@
-Summary: Accessing HP iLO interfaces from python
-Name: python-hpilo
-Version: 4.4.3
-Release: 1%{?dist}
-Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-License: GPL/APL
-Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Prefix: %{_prefix}
-BuildArch: noarch
-Vendor: Dennis Kaarsemaker <dennis@kaarsemaker.net>
-Url: http://github.com/seveas/python-hpilo
-BuildRequires: python python-setuptools
-
-%description
-This module will make it easy for you to access the Integrated Lights Out
-management interface of your HP hardware. It supports RILOE II, iLO, iLO 2, iLO
-3 and iLO 4. It uses the XML interface or hponcfg to access and change the iLO.
-
-%prep
-%setup -n %{name}-%{version}
-
-%build
-python setup.py build
-
-%install
-python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
-sed -e 's!/usr/bin/python!/usr/bin/python3!' -i $RPM_BUILD_ROOT/usr/bin/hpilo_cli
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f INSTALLED_FILES
-%doc docs
-%doc examples
-%doc README.md
-%doc CHANGES
-%defattr(-,root,root)
diff --git a/docs/install.rst b/docs/install.rst
index c475e23..fa8b2b7 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -27,9 +27,11 @@ Sometimes needed:
 Installing the latest release
 -----------------------------
 
-The easiest way is to install with pip::
+The easiest way is to install with pip:
 
-``pip3 install python-hpilo``
+.. code-block:: console
+
+   $ pip3 install python-hpilo
 
 You can also download the package from `PyPI`_ and install it manually like any
 other application by unpacking it and running ``python setup.py install``.
diff --git a/docs/methods b/docs/methods
deleted file mode 100644
index b4a2d37..0000000
--- a/docs/methods
+++ /dev/null
@@ -1,121 +0,0 @@
-activate_license
-add_federation_group
-add_user
-ahs_clear_data
-cert_fqdn
-certificate_signing_request
-clear_ilo_event_log
-clear_server_event_log
-clear_server_power_on_time
-computer_lock_config
-dc_registration_complete
-delete_federation_group
-delete_user
-disable_ers
-eject_virtual_floppy
-eject_virtual_media
-ers_ahs_submit
-fips_enable
-factory_defaults
-get_ahs_status
-get_all_users
-get_all_user_info
-get_asset_tag
-get_cert_subject_info
-get_current_boot_mode
-get_dir_config
-get_embedded_health
-get_encrypt_settings
-get_ers_settings
-get_federation_all_groups
-get_federation_all_groups_info
-get_federation_group
-get_federation_multicast
-get_fips_status
-get_fw_version
-get_global_settings
-get_host_data
-get_host_power_saver_status
-get_host_power_status
-get_host_pwr_micro_ver
-get_ilo_event_log
-get_language
-get_all_languages
-get_all_licenses
-get_hotkey_config
-get_network_settings
-get_oa_info
-get_one_time_boot
-get_pending_boot_mode
-get_persistent_boot
-get_pers_mouse_keyboard_enabled
-get_power_cap
-get_power_readings
-get_product_name
-get_pwreg
-get_rack_settings
-get_security_msg
-get_server_auto_pwr
-get_server_event_log
-get_server_fqdn
-get_server_name
-get_server_power_on_time
-get_smh_fqdn
-get_snmp_im_settings
-get_spatial
-get_sso_settings
-get_supported_boot_mode
-get_tpm_status
-get_twofactor_settings
-get_uid_status
-get_user
-get_vm_status
-hotkey_config
-import_certificate
-import_ssh_key
-delete_ssh_key
-insert_virtual_media
-mod_federation_group
-mod_global_settings
-mod_network_settings
-mod_dir_config
-mod_snmp_im_settings
-mod_sso_settings
-mod_user
-press_pwr_btn
-profile_apply
-profile_apply_get_results
-profile_delete
-profile_desc_download
-profile_list
-hold_pwr_btn
-cold_boot_server
-warm_boot_server
-reset_rib
-reset_server
-set_ahs_status
-set_asset_tag
-set_ers_direct_connect
-set_ers_irs_connect
-set_ers_web_proxy
-set_federation_multicast
-set_language
-set_host_power
-set_host_power_saver
-set_one_time_boot
-set_pending_boot_mode
-set_persistent_boot
-set_pers_mouse_keyboard_enabled
-set_pwreg
-set_power_cap
-set_security_msg
-set_server_auto_pwr
-set_server_fqdn
-set_server_name
-set_vf_status
-set_vm_status
-trigger_l2_collection
-trigger_test_event
-uid_control
-update_rib_firmware
-xmldata
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index bdb2d7e..76e63a6 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -47,7 +47,7 @@ Occasionally you might see this error at the end of a traceback::
 
   hpilo.IloError: Error communicating with iLO: Syntax error: Line #0: syntax error near "" in the line: ""
 
-This generaly means that you are trying to call a method that is not supported
+This generally means that you are trying to call a method that is not supported
 for your device or the firmware version you use. Get this information with::
 
   hpilo_cli example-server.int.kaarsemaker.net get_fw_version
@@ -62,7 +62,7 @@ SSL: SSLV3_ALERT_HANDSHAKE_FAILURE] sslv3 alert handshake failure (_ssl.c:661)
 ------------------------------------------------------------------------------
 Your operating system vendor wisely doesn't support older SSL protocols
 anymore, and your iLO firmware is too old. Try using an older version of your
-os, possibly in a vm, chroot or container to ugrade the firmware of your iLO
+os, possibly in a vm, chroot or container to upgrade the firmware of your iLO
 
 ElementTree.ParseError
 -----------------------
@@ -103,9 +103,9 @@ first update to 1.40 and then update to a later version::
 `hpilo.IloError: Error reading configuration`
 ---------------------------------------------
 This error might occur in delayed mode when one of the calls causes a reset of
-the iLO, such as changing network settings or reseting to factory defaults. All
+the iLO, such as changing network settings or resetting to factory defaults. All
 delayed calls called by the same `call_delayed` after this reset may then cause
-this error as the iLO is reseting. For example, when calling `hpilo_cli
+this error as the iLO is resetting. For example, when calling `hpilo_cli
 localhost factory_defaults + activate_license key=12345`, the
 `activate_license` call may fail with this error. If you hit this issue and you
 use calls that can cause a reset, make sure you either use them outside a
diff --git a/examples/elasticsearch/.gitignore b/examples/elasticsearch/.gitignore
deleted file mode 100644
index 1fdc59c..0000000
--- a/examples/elasticsearch/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-servers.py
diff --git a/firmware.conf b/firmware.conf
deleted file mode 100644
index cfac2dc..0000000
--- a/firmware.conf
+++ /dev/null
@@ -1,624 +0,0 @@
-[ilo]
-version = 1.96
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1980791503/v97349/CP023365.scexe
-file = ilo196.bin
-
-[ilo 1.87]
-version = 1.87
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308174093/v33430/CP006786.scexe
-file = ilo187.bin
-
-[ilo 1.88]
-version = 1.88
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308174093/v35729/CP006953.scexe
-file = ilo188.bin
-
-[ilo 1.89]
-version = 1.89
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308174093/v38868/CP007118.scexe
-file = ilo189.bin
-
-[ilo 1.91]
-version = 1.91
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308174093/v41461/CP007684.scexe
-file = ilo191.bin
-
-[ilo 1.92]
-version = 1.92
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308174093/v44421/CP008488.scexe
-file = ilo192.bin
-
-[ilo 1.93]
-version = 1.93
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1980791503/v50126/CP009895.scexe
-file = ilo193.bin
-
-[ilo 1.94]
-version = 1.94
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1980791503/v51876/CP010428.scexe
-file = ilo194.bin
-
-[ilo 1.95]
-version = 1.95
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1980791503/v57149/CP011850.scexe
-file = ilo195.bin
-
-[ilo 1.96]
-version = 1.96
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1980791503/v97349/CP023365.scexe
-file = ilo196.bin
-
-[ilo2]
-version = 2.33
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v148520/CP035238.scexe
-file = ilo2_233.bin
-
-[ilo2 1.20]
-version = 1.20
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308277578/v33150/CP006634.scexe
-file = ilo2_120.bin
-
-[ilo2 1.22]
-version = 1.22
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v33324/CP006747.scexe
-file = ilo2_122.bin
-
-[ilo2 1.24]
-version = 1.24
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v35700/CP006942.scexe
-file = ilo2_124.bin
-
-[ilo2 1.26]
-version = 1.26
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v39551/CP007149.scexe
-file = ilo2_126.bin
-
-[ilo2 1.29]
-version = 1.29
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v40736/CP007549.scexe
-file = ilo2_129.bin
-
-[ilo2 1.30]
-version = 1.30
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v41965/CP007818.scexe
-file = ilo2_130.bin
-
-[ilo2 1.35]
-version = 1.35
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v42540/CP007977.scexe
-file = ilo2_135.bin
-
-[ilo2 1.40]
-version = 1.40
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v43257/CP008198.scexe
-file = ilo2_140.bin
-
-[ilo2 1.42]
-version = 1.42
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v43790/CP008317.scexe
-file = ilo2_142.bin
-
-[ilo2 1.43]
-version = 1.43
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v45110/CP008590.scexe
-file = ilo2_143.bin
-
-[ilo2 1.50]
-version = 1.50
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p308280586/v45689/CP008777.scexe
-file = ilo2_150.bin
-
-[ilo2 1.60]
-version = 1.60
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v47657/CP009237.scexe
-file = ilo2_160.bin
-
-[ilo2 1.61]
-version = 1.61
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v49242/CP009636.scexe
-file = ilo2_161.bin
-
-[ilo2 1.70]
-version = 1.70
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v49991/CP009857.scexe
-file = ilo2_170.bin
-
-[ilo2 1.75]
-version = 1.75
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v51453/CP010337.scexe
-file = ilo2_175.bin
-
-[ilo2 1.77]
-version = 1.77
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v52557/CP010541.scexe
-file = ilo2_177.bin
-
-[ilo2 1.78]
-version = 1.78
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v54329/CP011095.scexe
-file = ilo2_178.bin
-
-[ilo2 1.79]
-version = 1.79
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v55943/CP011535.scexe
-file = ilo2_179.bin
-
-[ilo2 1.80]
-version = 1.80
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v57485/CP011945.scexe
-file = ilo2_180.bin
-
-[ilo2 1.81]
-version = 1.81
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v58075/CP012108.scexe
-file = ilo2_181.bin
-
-[ilo2 1.82]
-version = 1.82
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v59643/CP012567.scexe
-file = ilo2_182.bin
-
-[ilo2 1.83]
-version = 1.83
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v98108/CP023549.scexe
-file = ilo2_183.bin
-
-[ilo2 2.01]
-version = 2.01
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v63249/CP013601.scexe
-file = ilo2_201.bin
-
-[ilo2 2.05]
-version = 2.05
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v65718/CP014256.scexe
-file = ilo2_205.bin
-
-[ilo2 2.06]
-version = 2.06
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v68054/CP014890.scexe
-file = ilo2_206.bin
-
-[ilo2 2.07]
-version = 2.07
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v71019/CP015685.scexe
-file = ilo2_207.bin
-
-[ilo2 2.08]
-version = 2.08
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v74437/CP016664.scexe
-file = ilo2_208.bin
-
-[ilo2 2.09]
-version = 2.09
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v75848/CP017013.scexe
-file = ilo2_209.bin
-
-[ilo2 2.12]
-version = 2.12
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v78468/CP017737.scexe
-file = ilo2_212.bin
-
-[ilo2 2.13]
-version = 2.13
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v80498/CP018259.scexe
-file = ilo2_213.bin
-
-[ilo2 2.15]
-version = 2.15
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v82920/CP019022.scexe
-file = ilo2_215.bin
-
-[ilo2 2.20]
-version = 2.20
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v85709/CP019821.scexe
-file = ilo2_220.bin
-
-[ilo2 2.22]
-version = 2.22
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v90711/CP021566.scexe
-file = ilo2_222.bin
-
-[ilo2 2.23]
-version = 2.23
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v91953/CP021881.scexe
-file = ilo2_223.bin
-
-[ilo2 2.25]
-version = 2.25
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1285463034/v96369/CP023069.scexe
-file = ilo2_225.bin
-
-[ilo2 2.27]
-version = 2.27
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v104866/CP025666.scexe
-file = ilo2_227.bin
-
-[ilo2 2.28]
-version = 2.28
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v108120/CP026708.scexe
-file = ilo2_228.bin
-
-[ilo2 2.29]
-version = 2.29
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v112310/CP027871.scexe
-file = ilo2_229.bin
-
-[ilo2 2.30]
-version = 2.30
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v128193/CP032232.scexe
-file = ilo2_230.bin
-
-[ilo2 2.31]
-version = 2.31
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v142909/CP033889.scexe
-file = ilo2_231.bin
-
-[ilo2 2.32]
-version = 2.32
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v144949/CP034429.scexe
-file = ilo2_232.bin
-
-[ilo2 2.33]
-version = 2.33
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p915269625/v148520/CP035238.scexe
-file = ilo2_233.bin
-
-[ilo3]
-version = 1.93
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v183969/CP044657.scexe
-file = ilo3_193.bin
-
-[ilo3 1.00]
-version = 1.00
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v57781/CP012025.scexe
-file = ilo3_100.bin
-
-[ilo3 1.05]
-version = 1.05
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v60837/CP012894.scexe
-file = ilo3_105.bin
-
-[ilo3 1.10]
-version = 1.10
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v62116/CP013210.scexe
-file = ilo3_110.bin
-
-[ilo3 1.15]
-version = 1.15
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v62444/CP013313.scexe
-file = ilo3_115.bin
-
-[ilo3 1.16]
-version = 1.16
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v65714/CP014254.scexe
-file = ilo3_116.bin
-
-[ilo3 1.20]
-version = 1.20
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v64722/CP014002.scexe
-file = ilo3_120.bin
-
-[ilo3 1.26]
-version = 1.26
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v70182/CP015458.scexe
-file = ilo3_126.bin
-
-[ilo3 1.28]
-version = 1.28
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v73832/CP016462.scexe
-file = ilo3_128.bin
-
-[ilo3 1.50]
-version = 1.50
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v73060/CP016203.scexe
-file = ilo3_150.bin
-
-[ilo3 1.55]
-version = 1.55
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v81459/CP018561.scexe
-file = ilo3_155.bin
-
-[ilo3 1.57]
-version = 1.57
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v87094/CP020301.scexe
-file = ilo3_157.bin
-
-[ilo3 1.61]
-version = 1.61
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v89960/CP021281.scexe
-file = ilo3_161.bin
-
-[ilo3 1.65]
-version = 1.65
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v92752/CP022033.scexe
-file = ilo3_165.bin
-
-[ilo3 1.70]
-version = 1.70
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v88836/CP020873.scexe
-file = ilo3_170.bin
-
-[ilo3 1.80]
-version = 1.80
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1255562964/v94618/CP022551.scexe
-file = ilo3_180.bin
-
-[ilo3 1.82]
-version = 1.82
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v104114/CP025437.scexe
-file = ilo3_182.bin
-
-[ilo3 1.85]
-version = 1.85
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v107245/CP026424.scexe
-file = ilo3_185.bin
-
-[ilo3 1.87]
-version = 1.87
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v113322/CP028239.scexe
-file = ilo3_187.bin
-
-[ilo3 1.88]
-version = 1.88
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v116231/CP029099.scexe
-file = ilo3_188.bin
-
-[ilo3 1.89]
-version = 1.89
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v127869/CP032172.scexe
-file = ilo3_189.bin
-
-[ilo3 1.90]
-version = 1.90
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v149362/CP035511.scexe
-file = ilo3_190.bin
-
-[ilo3 1.91]
-version = 1.91
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v158427/CP037906.scexe
-file = ilo3_191.bin
-
-[ilo3 1.92]
-version = 1.92
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v176309/CP042794.scexe
-file = ilo3_192.bin
-
-[ilo3 1.93]
-version = 1.93
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1573561412/v183969/CP044657.scexe
-file = ilo3_193.bin
-
-[ilo4]
-version = 2.76
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v183797/CP044610.scexe
-file = ilo4_276.bin
-
-[ilo4 1.01]
-version = 1.01
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1950562118/v72782/CP016116.scexe
-file = ilo4_101.bin
-
-[ilo4 1.05]
-version = 1.05
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1950562118/v74710/CP016765.scexe
-file = ilo4_105.bin
-
-[ilo4 1.10]
-version = 1.10
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1950562118/v76510/CP017241.scexe
-file = ilo4_110.bin
-
-[ilo4 1.13]
-version = 1.13
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v83089/CP019101.scexe
-file = ilo4_113.bin
-
-[ilo4 1.20]
-version = 1.20
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v79401/CP017976.scexe
-file = ilo4_120.bin
-
-[ilo4 1.22]
-version = 1.22
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v85901/CP019887.scexe
-file = ilo4_122.bin
-
-[ilo4 1.30]
-version = 1.30
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1950562118/v80804/CP018365.scexe
-file = ilo4_130.bin
-
-[ilo4 1.32]
-version = 1.32
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1950562118/v91629/CP021804.scexe
-file = ilo4_132.bin
-
-[ilo4 1.40]
-version = 1.40
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v87181/CP020340.scexe
-file = ilo4_140.bin
-
-[ilo4 1.50]
-version = 1.50
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v94428/CP022524.scexe
-file = ilo4_150.bin
-
-[ilo4 1.51]
-version = 1.51
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v98384/CP023645.scexe
-file = ilo4_151.bin
-
-[ilo4 1.53]
-version = 1.53
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v100933/CP024444.scexe
-file = ilo4_153.bin
-
-[ilo4 2.00]
-version = 2.00
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v79407/CP017980.scexe
-file = ilo4_200.bin
-
-[ilo4 2.02]
-version = 2.02
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v100330/CP024170.scexe
-file = ilo4_202.bin
-
-[ilo4 2.03]
-version = 2.03
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v102910/CP025110.scexe
-file = ilo4_203.bin
-
-[ilo4 2.10]
-version = 2.10
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1457726527/v101197/CP024540.scexe
-file = ilo4_210.bin
-
-[ilo4 2.11]
-version = 2.11
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1892756734/v105467/CP025816.scexe
-file = ilo4_211.bin
-
-[ilo4 2.20]
-version = 2.20
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1950562118/v103093/CP025143.scexe
-file = ilo4_220.bin
-
-[ilo4 2.22]
-version = 2.22
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v111019/CP027514.scexe
-file = ilo4_222.bin
-
-[ilo4 2.30]
-version = 2.30
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v106715/CP026236.scexe
-file = ilo4_230.bin
-
-[ilo4 2.31]
-version = 2.31
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v112690/CP027992.scexe
-file = ilo4_231.bin
-
-[ilo4 2.40]
-version = 2.40
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v111237/CP027578.scexe
-file = ilo4_240.bin
-
-[ilo4 2.42]
-version = 2.42
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v117904/CP029630.scexe
-file = ilo4_242.bin
-
-[ilo4 2.44]
-version = 2.44
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v119757/CP030133.scexe
-file = ilo4_244.bin
-
-[ilo4 2.50]
-version = 2.50
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v112485/CP027911.scexe
-file = ilo4_250.bin
-
-[ilo4 2.53]
-version = 2.53
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v124470/CP031406.scexe
-file = ilo4_253.bin
-
-[ilo4 2.54]
-version = 2.54
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v133828/CP032620.scexe
-file = ilo4_254.bin
-
-[ilo4 2.55]
-version = 2.55
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v129421/CP032487.scexe
-file = ilo4_255.bin
-
-[ilo4 2.60]
-version = 2.60
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v142463/CP033806.scexe
-file = ilo4_260.bin
-
-[ilo4 2.61]
-version = 2.61
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v154294/CP036949.scexe
-file = ilo4_261.bin
-
-[ilo4 2.62]
-version = 2.62
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v160135/CP038290.scexe
-file = ilo4_262.bin
-
-[ilo4 2.70]
-version = 2.70
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v158634/CP037959.scexe
-file = ilo4_270.bin
-
-[ilo4 2.72]
-version = 2.72
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v170463/CP041058.scexe
-file = ilo4_272.bin
-
-[ilo4 2.73]
-version = 2.73
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v176128/CP042663.scexe
-file = ilo4_273.bin
-
-[ilo4 2.75]
-version = 2.75
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v182737/CP044405.scexe
-file = ilo4_275.bin
-
-[ilo4 2.76]
-version = 2.76
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p192122427/v183797/CP044610.scexe
-file = ilo4_276.bin
-
-[ilo5]
-version = 2.33
-url = https://downloads.hpe.com/pub/softlib2/software1/fwpkg-ilo/p991377599/v188217/ilo5_233.fwpkg
-file = ilo5_233.bin
-
-[ilo5 1.20]
-version = 1.20
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1342933511/v138105/CP032773.scexe
-file = ilo5_120.bin
-
-[ilo5 1.30]
-version = 1.30
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1342933511/v144224/CP034170.scexe
-file = ilo5_130.bin
-
-[ilo5 1.35]
-version = 1.35
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1342933511/v153199/CP036661.scexe
-file = ilo5_135.bin
-
-[ilo5 1.37]
-version = 1.37
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1342933511/v157138/CP037568.scexe
-file = ilo5_137.bin
-
-[ilo5 1.39]
-version = 1.39
-url = https://downloads.hpe.com/pub/softlib2/software1/sc-linux-fw-ilo/p1342933511/v159725/CP038198.scexe
-file = ilo5_139.bin
-
-[ilo5 2.18]
-version = 2.18
-url = https://downloads.hpe.com/pub/softlib2/software1/fwpkg-ilo/p991377599/v183732/ilo5_218.fwpkg
-file = ilo5_218.bin
-
-[ilo5 2.30]
-version = 2.30
-url = https://downloads.hpe.com/pub/softlib2/software1/fwpkg-ilo/p991377599/v167897/ilo5_230.fwpkg
-file = ilo5_230.bin
-
-[ilo5 2.31]
-version = 2.31
-url = https://downloads.hpe.com/pub/softlib2/software1/fwpkg-ilo/p991377599/v182694/ilo5_231.fwpkg
-file = ilo5_231.bin
-
-[ilo5 2.33]
-version = 2.33
-url = https://downloads.hpe.com/pub/softlib2/software1/fwpkg-ilo/p991377599/v188217/ilo5_233.fwpkg
-file = ilo5_233.bin
diff --git a/hpilo.py b/hpilo.py
index 4239ccd..78c5b31 100644
--- a/hpilo.py
+++ b/hpilo.py
@@ -564,7 +564,7 @@ class Ilo(object):
             data = data.replace('\x01', '')
         
         # Quite a few unescaped quotation mark bugs keep appearing. Let's try
-        # to fix up the XML by replacing the last occurence of a quotation mark
+        # to fix up the XML by replacing the last occurrence of a quotation mark
         # *before* the position of the error.
         #
         # Definitely not an optimal algorithm, but this is not a hot path.
@@ -1176,7 +1176,7 @@ class Ilo(object):
         return self._info_tag('RIB_INFO', 'GET_FEDERATION_GROUP', attrib={'GROUP_NAME': group_name}, process=process)
 
     def get_federation_multicast(self):
-        """Get the iLO federation mulicast settings"""
+        """Get the iLO federation multicast settings"""
         return self._info_tag('RIB_INFO', 'GET_FEDERATION_MULTICAST')
 
     def get_fips_status(self):
@@ -1660,6 +1660,8 @@ class Ilo(object):
             if key.endswith('_priv'):
                 if isinstance(val, basestring):
                     val = val.replace('oemhp_', '').replace('_priv', '').split(',')
+                if not hasattr(val, '__iter__'):
+                    val = [val]
                 val = ','.join([str(privmap.get(x,x)) for x in val])
             else:
                 val = str({True: 'Yes', False: 'No'}.get(val, val))
@@ -1721,7 +1723,7 @@ class Ilo(object):
         return self._control_tag('SSO_INFO', 'MOD_SSO_SETTINGS', elements=elements)
 
     def mod_twofactor_settings(self, auth_twofactor_enable=None, cert_revocation_check=None, cert_owner_san=None, cert_owner_subject=None):
-        """Modify the twofactor authenticatino settings"""
+        """Modify the twofactor authentication settings"""
         elements = []
         if auth_twofactor_enable is not None:
             elements.append(etree.Element('AUTH_TWOFACTOR_ENABLE', VALUE=['No', 'Yes'][bool(auth_twofactor_enable)]))
@@ -1954,7 +1956,7 @@ class Ilo(object):
 
     def set_server_auto_pwr(self, setting):
         """Set the automatic power on delay setting. Valid settings are False,
-           True (for minumum delay), 15, 30, 45 60 (for that amount of delay)
+           True (for minimum delay), 15, 30, 45 60 (for that amount of delay)
            or random (for a random delay of up to 60 seconds.)"""
         setting = str({True: 'Yes', False: 'No'}.get(setting, setting))
         return self._control_tag('SERVER_INFO', 'SERVER_AUTO_PWR', attrib={'VALUE': setting})
@@ -2105,7 +2107,9 @@ class Ilo(object):
                 data = fd.read()
         else:
             url = 'https://%s:%s/xmldata?item=%s' % (self.hostname, self.port, item)
-            if hasattr(ssl, 'create_default_context'):
+            if self.ssl_context:
+                opener = urllib2.build_opener(urllib2.ProxyHandler({}), urllib2.HTTPSHandler(context=self.ssl_context))
+            elif hasattr(ssl, 'create_default_context'):
                 ctx = ssl.create_default_context()
                 ctx.check_hostname = False
                 ctx.verify_mode = ssl.CERT_NONE
diff --git a/python_hpilo.egg-info/PKG-INFO b/python_hpilo.egg-info/PKG-INFO
new file mode 100644
index 0000000..d11b06c
--- /dev/null
+++ b/python_hpilo.egg-info/PKG-INFO
@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: python-hpilo
+Version: 4.4.3
+Summary: iLO automation from python or shell
+Home-page: http://github.com/seveas/python-hpilo
+Author: Dennis Kaarsemaker
+Author-email: dennis@kaarsemaker.net
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: System :: Hardware
+Classifier: Topic :: System :: Systems Administration
+Classifier: Topic :: System :: Networking
+License-File: COPYING
diff --git a/python_hpilo.egg-info/SOURCES.txt b/python_hpilo.egg-info/SOURCES.txt
new file mode 100644
index 0000000..fca5c21
--- /dev/null
+++ b/python_hpilo.egg-info/SOURCES.txt
@@ -0,0 +1,125 @@
+CHANGES
+COPYING
+MANIFEST.in
+README.md
+hpilo.py
+hpilo_cli
+hpilo_fw.py
+ilo.conf.example
+setup.py
+docs/Makefile
+docs/ahs.rst
+docs/authentication.rst
+docs/autofirmware.rst
+docs/boot.rst
+docs/ca.rst
+docs/conf.py
+docs/contributing.rst
+docs/elasticsearch.rst
+docs/federation.rst
+docs/firmware.rst
+docs/health.rst
+docs/ilodoc.py
+docs/index.rst
+docs/info.rst
+docs/input.rst
+docs/install.rst
+docs/license.rst
+docs/log.rst
+docs/media.rst
+docs/networksettings.rst
+docs/power.rst
+docs/profile.rst
+docs/puppet.rst
+docs/python.rst
+docs/security.rst
+docs/shell.rst
+docs/snmp.rst
+docs/troubleshooting.rst
+docs/xmldata.rst
+docs/_static/kibana.png
+docs/_static/python-hpilo.png
+docs/output/get_ahs_status
+docs/output/get_all_languages
+docs/output/get_all_licenses
+docs/output/get_all_user_info
+docs/output/get_all_users
+docs/output/get_asset_tag
+docs/output/get_asset_tag_1
+docs/output/get_cert_subject_info
+docs/output/get_critical_temp_remain_off
+docs/output/get_current_boot_mode
+docs/output/get_dir_config
+docs/output/get_dir_test_results
+docs/output/get_embedded_health
+docs/output/get_encrypt_settings
+docs/output/get_ers_settings
+docs/output/get_federation_all_groups
+docs/output/get_federation_all_groups_info
+docs/output/get_federation_group
+docs/output/get_federation_multicast
+docs/output/get_fips_status
+docs/output/get_fw_version
+docs/output/get_global_settings
+docs/output/get_host_data
+docs/output/get_host_power_saver_status
+docs/output/get_host_power_status
+docs/output/get_host_pwr_micro_ver
+docs/output/get_hotkey_config
+docs/output/get_ilo_event_log
+docs/output/get_language
+docs/output/get_network_settings
+docs/output/get_oa_info
+docs/output/get_one_time_boot
+docs/output/get_pending_boot_mode
+docs/output/get_pers_mouse_keyboard_enabled
+docs/output/get_persistent_boot
+docs/output/get_power_cap
+docs/output/get_power_readings
+docs/output/get_product_name
+docs/output/get_pwreg
+docs/output/get_rack_settings
+docs/output/get_sdcard_status
+docs/output/get_security_msg
+docs/output/get_server_auto_pwr
+docs/output/get_server_event_log
+docs/output/get_server_fqdn
+docs/output/get_server_name
+docs/output/get_server_power_on_time
+docs/output/get_smh_fqdn
+docs/output/get_snmp_im_settings
+docs/output/get_spatial
+docs/output/get_sso_settings
+docs/output/get_supported_boot_mode
+docs/output/get_tpm_status
+docs/output/get_twofactor_settings
+docs/output/get_uid_status
+docs/output/get_user
+docs/output/get_vm_status
+docs/output/xmldata
+docs/output/xmldata_1
+examples/ca/hpilo_ca
+examples/elasticsearch/hpilo_es_dump
+examples/elasticsearch/hpilo_es_import
+examples/elasticsearch/kibana-dashboard.json
+examples/elasticsearch/servers.py.example
+examples/firmwareupdater/hpilo_firmware_update
+examples/puppet/modules/ilo/lib/puppet/provider/ilo.rb
+examples/puppet/modules/ilo/lib/puppet/provider/ilo_firmware/ilo_firmware.rb
+examples/puppet/modules/ilo/lib/puppet/provider/ilo_license/ilo_license.rb
+examples/puppet/modules/ilo/lib/puppet/provider/ilo_settings/ilo_settings.rb
+examples/puppet/modules/ilo/lib/puppet/provider/ilo_user/ilo_user.rb
+examples/puppet/modules/ilo/lib/puppet/type/ilo_firmware.rb
+examples/puppet/modules/ilo/lib/puppet/type/ilo_license.rb
+examples/puppet/modules/ilo/lib/puppet/type/ilo_settings.rb
+examples/puppet/modules/ilo/lib/puppet/type/ilo_user.rb
+examples/puppet/modules/ilo/lib/puppet/util/network_device/ilo.rb
+examples/puppet/modules/ilo/lib/puppet/util/network_device/ilo/device.rb
+examples/puppet/modules/ilo/lib/puppet/util/network_device/ilo/facts.rb
+examples/puppet/modules/ilo/lib/puppet/util/network_device/ilo/transport.rb
+examples/puppet/modules/ilo/manifests/init.pp
+examples/puppet/modules/ilo/templates/ilo-device.erb
+python_hpilo.egg-info/PKG-INFO
+python_hpilo.egg-info/SOURCES.txt
+python_hpilo.egg-info/dependency_links.txt
+python_hpilo.egg-info/top_level.txt
\ No newline at end of file
diff --git a/python_hpilo.egg-info/dependency_links.txt b/python_hpilo.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/python_hpilo.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/python_hpilo.egg-info/top_level.txt b/python_hpilo.egg-info/top_level.txt
new file mode 100644
index 0000000..8fd83f0
--- /dev/null
+++ b/python_hpilo.egg-info/top_level.txt
@@ -0,0 +1,2 @@
+hpilo
+hpilo_fw
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..8bfd5a1
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/tests/README b/tests/README
deleted file mode 100644
index b887340..0000000
--- a/tests/README
+++ /dev/null
@@ -1,63 +0,0 @@
-Testsuite for python-hpilo
---------------------------
-
-This testsuite consists of two parts:
-- Tests for the XML generator and parser
-- Tests that actually contact iLO's
-
-The former use a corpus of known data, they're safe to run and run pretty
-quickly. The latter will change data on iLO's (and do their best to restore
-the data to previous values), will reset iLO's and take a long time to run.
-
-Test contributions wanted!
---------------------------
-For the corpus of test data, we need more people to submit data from their
-machines. This process is safe (no iLO data is changed at all), though can
-leak information about your systems if you are not careful. If you want to
-contribute, please do the following:
-
-$ cd tests/xml
-$ ./fetch_responses hostname-of-your-ilo-here
-
-This creates a new directory named after the hardware model, ilo model and ilo
-firmware of your machine. In it, you find raw and parsed responses of all
-python-hpilo queries. You should inspect this data and see if it's correct.
-You should also redact information you do not wish to share, but please don't
-go overboard.
-
-- Redacting iLO license keys makes perfect sense.
-- Redacting hostnames and IP addresses is acceptable, but please do not redact
-  anything else
-- When redacting, replace each letter of the redacted string with an x. Don't
-  add or remove characters
-- The .raw files may contain http chunked data, be very careful when editing
-  this and don't break the format. Preferably use a hex editor, or an editor
-  that does not mess with newlines (vim will do)
-
-You can either send me your datafiles via e-mail, or send a pull request on
-GitHub. If you do not know how to redact the data, or want me to do it for
-you, please send the data by e-mail and I will redact hostnames and iLO
-license keys.
-
-Running the tests
------------------
-Running the safe tests is as simple as running:
-
-$ python -munittest tests.test_requests
-$ python -munittest tests.test_responses
-
-You can run any of the tests this way, just replace test_requests with the
-name of the test. To run all tests, you can use:
-
-$ python -munittest discover
-
-However, if you run this without configuring the tests, you'll notice that
-nothing actually attempts to contact an iLO. You will need to tell it which
-iLOs to test. You do this in ~/.ilo.conf by adding test sections like the
-following:
-
-[test test-server]
-hostname = test-server.ilo.example.com
-
-Please don't run these tests on mission-critical servers. While they try very
-hard to restore the settings it changes, bugs and errors happen.
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/test_boot.py b/tests/test_boot.py
deleted file mode 100644
index 0ba159b..0000000
--- a/tests/test_boot.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-import random
-
-class BootTests(IloTestCase):
-    def test_persistent_boot(self, ilo):
-        old = ilo.get_persistent_boot()
-        new = old[:]
-        random.shuffle(new)
-        try:
-            ilo.set_persistent_boot(new)
-            self.assertEqual(new, ilo.get_persistent_boot())
-        finally:
-            ilo.set_persistent_boot(old)
-
-    def test_one_time_boot(self, ilo):
-        old = ilo.get_one_time_boot()
-        all = ilo.get_persistent_boot()
-        if old in all:
-            all.remove(old)
-        new = random.choice(all)
-        try:
-            ilo.set_one_time_boot(new)
-            self.assertEqual(new, ilo.get_one_time_boot())
-        finally:
-            ilo.set_one_time_boot(old)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_delayed.py b/tests/test_delayed.py
deleted file mode 100755
index 0a439b9..0000000
--- a/tests/test_delayed.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-
-class DelayedTests(IloTestCase):
-    def test_delayed_calls(self, ilo):
-        uid = {'ON': 'Yes', 'OFF': 'No'}[ilo.get_uid_status()]
-        non_delayed = [
-            ilo.get_all_users(),
-            ilo.get_global_settings(),
-        ]
-        try:
-            ilo.delayed = True
-            ilo.get_all_users()
-            ilo.uid_control(uid=uid)
-            ilo.get_global_settings()
-            delayed = ilo.call_delayed()
-        finally:
-            ilo.delayed = False
-        self.assertEquals(non_delayed, delayed)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_global_settings.py b/tests/test_global_settings.py
deleted file mode 100644
index c9fb14b..0000000
--- a/tests/test_global_settings.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-
-class GlobalSettingsTests(IloTestCase):
-    def test_mod_global_settings(self, ilo):
-        old = ilo.get_global_settings()
-        try:
-            ilo.mod_global_settings(
-                f8_login_required=True,
-                min_password=3
-            )
-            new = ilo.get_global_settings()
-            self.assertEqual(new['f8_login_required'], True)
-            self.assertEqual(new['min_password'], 3)
-        finally:
-            ilo.mod_global_settings(
-                f8_login_required=old['f8_login_required'],
-                min_password=old['min_password']
-            )
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_languages.py b/tests/test_languages.py
deleted file mode 100644
index af5550d..0000000
--- a/tests/test_languages.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-
-class LanguageTests(IloTestCase):
-    def test_languages(self, ilo):
-        ilo.set_language(ilo.get_language()['lang_id'])
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_logs.py b/tests/test_logs.py
deleted file mode 100644
index f18b005..0000000
--- a/tests/test_logs.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-import time
-
-class LogTests(IloTestCase):
-    def test_ilo_event_log(self, ilo):
-        ilo.clear_ilo_event_log()
-        time.sleep(2)
-        log = ilo.get_ilo_event_log()
-        self.assertTrue(type(log) != dict)
-        self.assertTrue(len(log) <= 3)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_network_settings.py b/tests/test_network_settings.py
deleted file mode 100644
index 7d285cf..0000000
--- a/tests/test_network_settings.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-
-class NetworkTests(IloTestCase):
-    def test_mod_network_settings(self, ilo):
-        old = ilo.get_network_settings()
-        try:
-            ilo.mod_network_settings(ter_dns_server='10.1.1.1')
-            self.reset_delay(ilo)
-            new = ilo.get_network_settings()
-            self.assertEquals(new['ter_dns_server'], '10.1.1.1')
-        finally:
-            ilo.mod_network_settings(ter_dns_server='' if old['ter_dns_server'] == '0.0.0.0' else old['ter_dns_server'])
-            self.reset_delay(ilo)
-
-    def test_ipv6_routes(self, ilo):
-        self.require_ilo(ilo, 'ilo3:1.50', 'ilo4:1.20')
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_requests.py b/tests/test_requests.py
deleted file mode 100755
index 1c9d070..0000000
--- a/tests/test_requests.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-
-class RequestsTestMeta(type):
-    def __new__(cls, name, parents, attrs):
-        root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'xml')
-        for machine in os.listdir(root):
-            mdir = os.path.join(root, machine)
-            if not os.path.isdir(mdir):
-                continue
-
-            files = os.listdir(mdir)
-            for argsfile in files:
-                if not argsfile.endswith('.args'):
-                    continue
-                method = argsfile[:argsfile.find('-')]
-                reqfile = argsfile.replace('.args', '.request')
-                reqtmpfile = argsfile.replace('.args', '.request.tmp')
-                argspath = os.path.join(mdir, argsfile)
-                reqpath = os.path.join(mdir, reqfile)
-                reqtmppath = os.path.join(mdir, reqtmpfile)
-                fname = 'test_%s_%s' % (machine, argsfile[:-5])
-                fname = re.sub('[^a-zA-Z_0-9]', '_', fname).lower()
-                attrs[fname] = eval("lambda self: self._test_request('%s', '%s', '%s', '%s', '%s')" % 
-                                    (machine, method, argspath, reqpath, reqtmppath))
-        return super(RequestsTestMeta, cls).__new__(cls, name, parents, attrs)
-
-class RequestsTest(unittest.TestCase):
-    __metaclass__ = RequestsTestMeta
-    maxDiff = None
-
-    def _test_request(self, machine, method, argsfile, reqfile, reqtmpfile):
-        ilo = hpilo.Ilo('nonexistent-machine','Administrator','TestPassword')
-        if 'ilo3' in machine.lower() or 'ilo4' in machine.lower():
-            ilo.protocol = hpilo.ILO_HTTP
-        else:
-            ilo.protocol = hpilo.ILO_RAW
-        if os.path.exists(reqtmpfile):
-            os.unlink(reqtmpfile)
-        ilo.save_request = reqtmpfile
-        with open(argsfile) as fd:
-            args, kwargs = eval(fd.read()), {}
-        if isinstance(args, dict):
-            args, kwargs = [], args
-
-        if not os.path.exists(reqfile):
-            self.assertRaises(ValueError, getattr(ilo, method), *args, **kwargs)
-            return
-
-        getattr(ilo, method)(*args, **kwargs)
-        with open(reqfile) as fd:
-            old = fd.read()
-        with open(reqtmpfile) as fd:
-            new = fd.read()
-        self.assertMultiLineEqual(old, new)
-        os.unlink(reqtmpfile)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_responses.py b/tests/test_responses.py
deleted file mode 100755
index 146b176..0000000
--- a/tests/test_responses.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-import pprint
-
-class ResponsesTestMeta(type):
-    def __new__(cls, name, parents, attrs):
-        root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'xml')
-        for machine in os.listdir(root):
-            mdir = os.path.join(root, machine)
-            if not os.path.isdir(mdir):
-                continue
-
-            files = os.listdir(mdir)
-            for rawfile in files:
-                if not rawfile.endswith('.raw'):
-                    continue
-                method = rawfile.replace('.raw', '')
-                parsedfile = rawfile.replace('.raw', '.parsed')
-                rawpath = os.path.join(mdir, rawfile)
-                parsedpath = os.path.join(mdir, parsedfile)
-                fname = 'test_%s_%s' % (machine, method)
-                fname = re.sub('[^a-zA-Z_0-9]', '_', fname).lower()
-                attrs[fname] = eval("lambda self: self._test_response('%s', '%s', '%s', '%s')" % 
-                                    (machine, method, rawpath, parsedpath))
-        return super(ResponsesTestMeta, cls).__new__(cls, name, parents, attrs)
-
-class ResponsesTest(unittest.TestCase):
-    __metaclass__ = ResponsesTestMeta
-    maxDiff = None
-    method_args = {
-        'get_user': ['Administrator'],
-        'get_federation_group': ['slartibartfast'],
-    }
-    def _test_response(self, machine, method, rawfile, parsedfile):
-        ilo = hpilo.Ilo('nonexistent-machine','Administrator','TestPassword')
-        if 'ilo3' in machine.lower() or 'ilo4' in machine.lower():
-            ilo.protocol = hpilo.ILO_HTTP
-        else:
-            ilo.protocol = hpilo.ILO_RAW
-        ilo.read_response = rawfile
-
-        args = self.method_args.get(method, [])
-        if not os.path.exists(parsedfile):
-            self.assertRaises(hpilo.IloError, getattr(ilo, method), *args)
-            return
-        response = getattr(ilo, method)(*args)
-        new = pprint.pformat(response) + '\n'
-        with open(parsedfile) as fd:
-            old = fd.read()
-        self.assertMultiLineEqual(old, new)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_snmp.py b/tests/test_snmp.py
deleted file mode 100644
index 127d45e..0000000
--- a/tests/test_snmp.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-
-class SnmpTests(IloTestCase):
-    def test_mod_snmp_im_settings(self, ilo):
-        old = ilo.get_snmp_im_settings()
-        try:
-            ilo.mod_snmp_im_settings(snmp_address_3='10.42.42.42', rib_traps=True)
-            new = ilo.get_snmp_im_settings()
-            self.assertEqual(new['snmp_address_3'], '10.42.42.42')
-            self.assertEqual(new['rib_traps'], True)
-        finally:
-            ilo.mod_snmp_im_settings(snmp_address_3=old['snmp_address_3'], rib_traps=old['rib_traps'])
-
-    def test_snmp_user_profiles(self, ilo):
-        self.require_ilo(ilo, 'ilo4')
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_uid.py b/tests/test_uid.py
deleted file mode 100644
index f8455e3..0000000
--- a/tests/test_uid.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-
-class UidTests(IloTestCase):
-    def test_uid(self, ilo):
-        old = ilo.get_uid_status()
-        new = {'ON': 'No', 'OFF': 'Yes'}[old]
-        new2 = {'ON': 'OFF', 'OFF': 'ON'}[old]
-        try:
-            ilo.uid_control(uid=new)
-            self.assertEqual(new2, ilo.get_uid_status())
-        finally:
-            ilo.uid_control(uid=old)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_users.py b/tests/test_users.py
deleted file mode 100755
index dfe753b..0000000
--- a/tests/test_users.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-from utils import *
-import random
-
-class UserTests(IloTestCase):
-    test_user_login = 'ilotestuser'
-
-    @classmethod
-    def setUpClass(cls):
-        for ilo in cls.ilos.values():
-            try:
-                ilo.delete_user(cls.test_user_login)
-            except hpilo.IloUserNotFound:
-                pass
-    tearDownClass = setUpClass
-
-    def test_user_creation(self, ilo):
-        alphabet = 'abcdefghijklmnopqrstuvwxyz'
-        alphabet += alphabet.upper()
-        password = ''.join([random.choice(alphabet) for i in range(random.randint(20,30))])
-        ilo.add_user(self.test_user_login, 'python-hpilo test user', password,
-                     admin_priv=False, remote_cons_priv=False, reset_server_priv=False,
-                     virtual_media_priv=False, config_ilo_priv=False)
-        user = ilo.get_user(self.test_user_login)
-        self.assertFalse(user['admin_priv'])
-        self.assertFalse(user['remote_cons_priv'])
-
-    def test_user_manipulation(self, ilo):
-        ilo.mod_user(self.test_user_login, remote_cons_priv=True)
-        user = ilo.get_user(self.test_user_login)
-        self.assertFalse(user['admin_priv'])
-        self.assertTrue(user['remote_cons_priv'])
-
-    def test_user_ssh_keys(self, ilo):
-        ssh_key = ''.join(['ssh-dss AAAAB3NzaC1kc3MAAACBAIpNY5fvLSS3MCjGNKjuWH',
-                           'rFGR5J6vLqdqIrXttTz7o6GWtmyxcC0Mlp2c/h1bMfvUiKDvDp',
-                           '+5T7SGo/2R+aXLaPwYtm6eBPEBU2CgVTnpeVELDeaJ/tr0kTL/',
-                           'PKMHZDFgT9c7/hOiWr4amlGvuxs60MP/xs4jWaxLxabhjiRoCL',
-                           'AAAAFQChDEFySo74rpPNNWfvJHgiylTbRQAAAIEAgo8UQqXP7g',
-                           'MTAUdHTqlzoTnj3loc4ZTnf3W6jr25cs5XaXNnRtadfw0G4VWa',
-                           'S/uDyNhsq/o2nFrhWTwAvojWSe4C5MDdGGerktL1ZY/QfoxB0d',
-                           '7aK/dlHd1iOVpGahCqyzmhEDmEnq6TWd6cBVHNVcryLEJVVtaf',
-                           '8QmJlwS+XkIAAACAJGnuO6ZJ1S2AMOY1uOpov/srTyuu6Pxtcn',
-                           'HsHA5wNoNQFcYElnDndJUfMAPi0vzODntHoiOGdrX3RcjxSAB5',
-                           'lAgNZwFnwGWoAa8UIQlX+GwDYAIk+8G36tmHRgtl7xJlFqs9W6',
-                           'BhrJEmfL4ubWCPXl/yMDrrLnMQuV3Mg0DNVSg= Test key'])
-        ilo.import_ssh_key(self.test_user_login, ssh_key)
-        ilo.delete_ssh_key(self.test_user_login)
-
-    def test_z_user_deletion(self, ilo):
-        ilo.delete_user(self.test_user_login)
-        self.assertRaises(hpilo.IloUserNotFound, ilo.get_user, self.test_user_login)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/utils.py b/tests/utils.py
deleted file mode 100644
index 768c9f3..0000000
--- a/tests/utils.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import unittest
-import ConfigParser
-import json
-import os
-import sys
-import time
-import re
-
-testroot = os.path.dirname(__file__)
-sys.path.insert(0, os.path.dirname(testroot))
-
-import hpilo
-import warnings
-warnings.filterwarnings("ignore", category=hpilo.IloWarning)
-
-class FirmwareCache(object):
-    def __init__(self):
-        self.cachefile = os.path.join(testroot, '.firmware_version_cache')
-        self.cache = {}
-        if os.path.exists(self.cachefile):
-            with open(self.cachefile) as fd:
-                self.cache = json.load(fd)
-
-    def __getitem__(self, ilo):
-        if ilo.hostname not in self.cache:
-            self.cache[ilo.hostname] = ilo.get_fw_version()
-            with open(self.cachefile, 'w') as fd:
-                json.dump(self.cache, fd)
-        return self.cache[ilo.hostname]
-firmware_cache = FirmwareCache()
-
-class IloTestCaseMeta(type):
-    def __new__(cls, name, bases, attrs):
-        attrs['ilos'] = {}
-        config = ConfigParser.ConfigParser()
-        config.read(os.path.expanduser(os.path.join('~', '.ilo.conf')))
-        login = config.get('ilo', 'login')
-        password = config.get('ilo', 'password')
-        methods = []
-        for attr in list(attrs.keys()):
-            if attr.startswith('test_') and callable(attrs[attr]):
-                attrs['_' + attr] = attrs.pop(attr)
-                methods.append(attr[5:])
-
-        for section in config.sections():
-            if not section.startswith('test '):
-                continue
-            key = section.split()[1]
-            hostname = config.get(section, 'ilo')
-            ilo = hpilo.Ilo(hostname, login, password)
-            ilo.firmware_version = firmware_cache[ilo]
-            if not ilo.protocol:
-                ilo.protocol = hpilo.ILO_RAW if ilo.firmware_version['management_processor'].lower() in ('ilo', 'ilo2') else hpilo.ILO_HTTP
-
-            ilo.save_response = os.path.join(testroot, 'hpilo_test_debug_output')
-            attrs['ilos'][key] = ilo
-            for method in methods:
-                fname = re.sub('[^a-zA-Z0-9_]', '_', 'test_%s_%s' % (key, method))
-                attrs[fname] = eval("lambda self: self._test_%s(self.ilos['%s'])" % (method, key))
-        return super(IloTestCaseMeta, cls).__new__(cls, name, bases, attrs)
-
-class IloTestCase(unittest.TestCase):
-    __metaclass__ = IloTestCaseMeta
-    maxDiff = None
-
-    def require_ilo(self, ilo, *ilos):
-        for ilov in ilos:
-            version = None
-            if ':' in ilov:
-                ilov, version = ilov.split(':')
-            if ilo.firmware_version['management_processor'].lower() == ilov:
-                if not version or ilo.firmware_version['firmware_version'] >= version:
-                    return True
-
-        raise unittest.SkipTest("This test requires %s, not %s:%s" % ('|'.join(ilos), 
-            ilo.firmware_version['management_processor'].lower(), ilo.firmware_version['firmware_version']))
-
-    def reset_delay(self, ilo):
-        time.sleep(30)
-        while True:
-            try:
-                ilo.get_fw_version()
-                return
-            except hpilo.IloCommunicationError:
-                time.sleep(10)
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/activate_license-7f53f289.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/activate_license-7f53f289.args
deleted file mode 100644
index 7efdd82..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/activate_license-7f53f289.args	
+++ /dev/null
@@ -1 +0,0 @@
-['XXXXX-XXXXX-XXXXX-XXXXX-XXXXX']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/activate_license-7f53f289.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/activate_license-7f53f289.request
deleted file mode 100644
index 41c30c3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/activate_license-7f53f289.request	
+++ /dev/null
@@ -1,25 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 257
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<LICENSE
->
-<ACTIVATE
- KEY="XXXXX-XXXXX-XXXXX-XXXXX-XXXXX"
- />
-</LICENSE>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_federation_group-bcc4ad26.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_federation_group-bcc4ad26.args
deleted file mode 100644
index bd4251a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_federation_group-bcc4ad26.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestGroup', 'TestKey', False, False, True]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_federation_group-bcc4ad26.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_federation_group-bcc4ad26.request
deleted file mode 100644
index 69a1dee..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_federation_group-bcc4ad26.request	
+++ /dev/null
@@ -1,42 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 490
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<ADD_FEDERATION_GROUP
- GROUP_KEY="TestKey"
- GROUP_NAME="TestGroup"
->
-<VIRTUAL_MEDIA_PRIV
- VALUE="No"
- />
-<RESET_SERVER_PRIV
- VALUE="Yes"
- />
-<CONFIG_ILO_PRIV
- VALUE="Yes"
- />
-<ADMIN_PRIV
- VALUE="No"
- />
-<REMOTE_CONS_PRIV
- VALUE="No"
- />
-<LOGIN_PRIV
- VALUE="No"
- />
-</ADD_FEDERATION_GROUP>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_user-1a1601fd.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_user-1a1601fd.args
deleted file mode 100644
index 8ec94eb..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_user-1a1601fd.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestUser', 'TestPass', 'Test User', True, False]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_user-1a1601fd.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_user-1a1601fd.request
deleted file mode 100644
index b9a1384..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/add_user-1a1601fd.request	
+++ /dev/null
@@ -1,40 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 460
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<USER_INFO
- MODE="write"
->
-<ADD_USER
- PASSWORD="Test User"
- USER_LOGIN="TestUser"
- USER_NAME="TestPass"
->
-<VIRTUAL_MEDIA_PRIV
- VALUE="No"
- />
-<RESET_SERVER_PRIV
- VALUE="No"
- />
-<CONFIG_ILO_PRIV
- VALUE="Yes"
- />
-<ADMIN_PRIV
- VALUE="Yes"
- />
-<REMOTE_CONS_PRIV
- VALUE="No"
- />
-</ADD_USER>
-</USER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ahs_clear_data-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ahs_clear_data-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ahs_clear_data-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ahs_clear_data-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ahs_clear_data-97d170e1.request
deleted file mode 100644
index 055a23a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ahs_clear_data-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 200
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<AHS_CLEAR_DATA
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cert_fqdn-89a06bbb.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cert_fqdn-89a06bbb.args
deleted file mode 100644
index 7cd8846..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cert_fqdn-89a06bbb.args	
+++ /dev/null
@@ -1 +0,0 @@
-[True]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cert_fqdn-89a06bbb.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cert_fqdn-89a06bbb.request
deleted file mode 100644
index 29345f9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cert_fqdn-89a06bbb.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 209
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<CERT_FQDN
- VALUE="Yes"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-8c0a1089.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-8c0a1089.args
deleted file mode 100644
index e20beb1..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-8c0a1089.args	
+++ /dev/null
@@ -1 +0,0 @@
-['NL', 'Flevoland']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-8c0a1089.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-8c0a1089.request
deleted file mode 100644
index 2eea0a0..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-8c0a1089.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 312
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<CERTIFICATE_SIGNING_REQUEST
->
-<CSR_COUNTRY
- VALUE="NL"
- />
-<CSR_STATE
- VALUE="Flevoland"
- />
-</CERTIFICATE_SIGNING_REQUEST>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-97d170e1.request
deleted file mode 100644
index ad7cf8c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 213
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<CERTIFICATE_SIGNING_REQUEST
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request.parsed
deleted file mode 100644
index 54fec7e..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'-----BEGIN CERTIFICATE REQUEST-----\nMIIDGzCCAgMCAQAwgYoxKTAnBgNVBAMMIGdhdGV3YXktMDAxLmFtczYubG9tLmJv\nb2tpbmcuY29tMQwwCgYDVQQLDANJU1MxIDAeBgNVBAoMF0hld2xldHQtUGFja2Fy\nZCBDb21wYW55MRAwDgYDVQQHDAdIb3VzdG9uMQ4wDAYDVQQIDAVUZXhhczELMAkG\nA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYq/ZOSuDH\n0HHkLkm4aKLW2uejGXsTYQakoj/nNqqKp5I/33Zhtt+XRAiyZYSik9GpntB1TeUw\nggFWG9JNsN1y8l+qvTQlZoOVZ2GambY2eajmL3NuDyCB523VeY6U7DSKhNqezjao\n+QcEWymx776fz7vABO5TIfB+glLavkLVb0ih+wf0KMaK/l/IaKylC1UtB+S1tK9v\niZ34lPwMKLlgrVzjptiv+bTY9nRSPZab7plv0zcjC+zZ9dsN+qX3vK7wTaHgysah\nxMwYSB5eKnaOA/iYzRaU70wr0smkLyH6A3StPCriy9qGXXuiBODX2jjaabnrb37X\ngUujrnCtjk7nAgMBAAGgSzBJBgkqhkiG9w0BCQ4xPDA6MDgGA1UdEQQxMC+CC2dh\ndGV3YXktMDAxgiBnYXRld2F5LTAwMS5hbXM2LmxvbS5ib29raW5nLmNvbTANBgkq\nhkiG9w0BAQUFAAOCAQEAe4wKv7jbviHFDi2HU6OPCk0IA18hkdTTepKu9OtznZuM\nztoL0wdPDtbHmPcmq9w8UHU73oVx31Zun0di6iGoe6/1LtpUeAKC20G5mGeBeDpw\nG4V6FZe5LU0/fJGMW8vvuDsBg77G9BQn0fUVSAKgOdaF1PSA3x55kzdKAVR/YfPl\npTHag4HecPI7b0g13ETYbSrAfaSLi2bhq4Uc51Qw1/DIiBVztSZ+8HyNO4AuyAdK\njMkBoRIUy31qGSu3biW/NcgiloqeY+UBLkpsqqcfyDOfqqpl/xm0vnl7IfVuQ49T\nKnm1OuuHaEe8HzMNUITCz0KUSVjetAYHbAN/zx4RTQ==\n-----END CERTIFICATE REQUEST-----'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request.raw
deleted file mode 100644
index 0bf3b41..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/certificate_signing_request.raw	
+++ /dev/null
@@ -1,99 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:18 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<CERTIFICATE_SIGNING_REQUEST>
------BEGIN CERTIFICATE REQUEST-----
-MIIDGzCCAgMCAQAwgYoxKTAnBgNVBAMMIGdhdGV3YXktMDAxLmFtczYubG9tLmJv
-b2tpbmcuY29tMQwwCgYDVQQLDANJU1MxIDAeBgNVB
-1ff
-AoMF0hld2xldHQtUGFja2Fy
-ZCBDb21wYW55MRAwDgYDVQQHDAdIb3VzdG9uMQ4wDAYDVQQIDAVUZXhhczELMAkG
-A1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYq/ZOSuDH
-0HHkLkm4aKLW2uejGXsTYQakoj/nNqqKp5I/33Zhtt+XRAiyZYSik9GpntB1TeUw
-ggFWG9JNsN1y8l+qvTQlZoOVZ2GambY2eajmL3NuDyCB523VeY6U7DSKhNqezjao
-+QcEWymx776fz7vABO5TIfB+glLavkLVb0ih+wf0KMaK/l/IaKylC1UtB+S1tK9v
-iZ34lPwMKLlgrVzjptiv+bTY9nRSPZab7plv0zcjC+zZ9dsN+qX3vK7wTaHgysah
-xMwYSB5eKnaOA/iYzRaU70wr0smkLyH6A3StPCriy9qGXXuiBODX2jjaabnrb37X
-gUujrnCtjk7nAgMBAAGgSzBJBgkqhkiG
-132
-9w0BCQ4xPDA6MDgGA1UdEQQxMC+CC2dh
-dGV3YXktMDAxgiBnYXRld2F5LTAwMS5hbXM2LmxvbS5ib29raW5nLmNvbTANBgkq
-hkiG9w0BAQUFAAOCAQEAe4wKv7jbviHFDi2HU6OPCk0IA18hkdTTepKu9OtznZuM
-ztoL0wdPDtbHmPcmq9w8UHU73oVx31Zun0di6iGoe6/1LtpUeAKC20G5mGeBeDpw
-G4V6FZe5LU0/fJGMW8vvuDsBg77G9BQn0fUVSAKgOdaF1PSA3x55kzdKAVR/YfPl
-pTHag4HecPI7b
-03f
-0g13ETYbSrAfaSLi2bhq4Uc51Qw1/DIiBVztSZ+8HyNO4AuyAdK
-jMkBoRIUy31
-09c
-qGSu3biW/NcgiloqeY+UBLkpsqqcfyDOfqqpl/xm0vnl7IfVuQ49T
-Knm1OuuHaEe8HzMNUITCz0KUSVjetAYHbAN/zx4RTQ==
------END CERTIFICATE REQUEST-----
-</CERTIFICATE_SIGNING_R
-04a
-EQUEST>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
- 
-03b
-   STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_ilo_event_log-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_ilo_event_log-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_ilo_event_log-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_ilo_event_log-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_ilo_event_log-97d170e1.request
deleted file mode 100644
index 45c21c7..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_ilo_event_log-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 200
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<CLEAR_EVENTLOG
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_event_log-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_event_log-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_event_log-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_event_log-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_event_log-97d170e1.request
deleted file mode 100644
index 4af95d2..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_event_log-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 201
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<CLEAR_IML
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_power_on_time-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_power_on_time-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_power_on_time-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_power_on_time-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_power_on_time-97d170e1.request
deleted file mode 100644
index 0e4ee1c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/clear_server_power_on_time-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 218
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<CLEAR_SERVER_POWER_ON_TIME
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cold_boot_server-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cold_boot_server-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cold_boot_server-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cold_boot_server-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cold_boot_server-97d170e1.request
deleted file mode 100644
index 7649346..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/cold_boot_server-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 208
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<COLD_BOOT_SERVER
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-7464a4ef.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-7464a4ef.args
deleted file mode 100644
index b9f058b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-7464a4ef.args	
+++ /dev/null
@@ -1 +0,0 @@
-[None, 'X']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-7464a4ef.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-7464a4ef.request
deleted file mode 100644
index 43adc29..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-7464a4ef.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 304
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<COMPUTER_LOCK_CONFIG
->
-<COMPUTER_LOCK
- VALUE="custom"
- />
-<COMPUTER_LOCK_KEY
- VALUE="X"
- />
-</COMPUTER_LOCK_CONFIG>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/computer_lock_config-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/dc_registration_complete-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/dc_registration_complete-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/dc_registration_complete-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/dc_registration_complete-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/dc_registration_complete-97d170e1.request
deleted file mode 100644
index 52ececf..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/dc_registration_complete-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 210
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<DC_REGISTRATION_COMPLETE
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_federation_group-10403cb0.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_federation_group-10403cb0.args
deleted file mode 100644
index 73c247f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_federation_group-10403cb0.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestGroup']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_federation_group-10403cb0.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_federation_group-10403cb0.request
deleted file mode 100644
index 4dddd2c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_federation_group-10403cb0.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 234
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<DELETE_FEDERATION_GROUP
- GROUP_NAME="TestGroup"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_ssh_key-e4b38d03.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_ssh_key-e4b38d03.args
deleted file mode 100644
index 29c5645..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_ssh_key-e4b38d03.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestUser']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_ssh_key-e4b38d03.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_ssh_key-e4b38d03.request
deleted file mode 100644
index b319406..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_ssh_key-e4b38d03.request	
+++ /dev/null
@@ -1,25 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 256
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<USER_INFO
- MODE="write"
->
-<MOD_USER
- USER_LOGIN="TestUser"
->
-<DEL_USERS_SSH_KEY
- />
-</MOD_USER>
-</USER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_user-e4b38d03.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_user-e4b38d03.args
deleted file mode 100644
index 29c5645..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_user-e4b38d03.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestUser']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_user-e4b38d03.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_user-e4b38d03.request
deleted file mode 100644
index c20955f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/delete_user-e4b38d03.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 223
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<USER_INFO
- MODE="write"
->
-<DELETE_USER
- USER_LOGIN="TestUser"
- />
-</USER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/disable_ers-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/disable_ers-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/disable_ers-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/disable_ers-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/disable_ers-97d170e1.request
deleted file mode 100644
index b984ce1..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/disable_ers-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 197
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<DISABLE_ERS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_floppy-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_floppy-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_floppy-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_floppy-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_floppy-97d170e1.request
deleted file mode 100644
index 10615e7..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_floppy-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 206
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<EJECT_VIRTUAL_FLOPPY
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_media-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_media-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_media-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_media-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_media-97d170e1.request
deleted file mode 100644
index cde699a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/eject_virtual_media-97d170e1.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 222
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<EJECT_VIRTUAL_MEDIA
- DEVICE="CDROM"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ers_ahs_submit-894e51e9.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ers_ahs_submit-894e51e9.args
deleted file mode 100644
index 21b6096..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ers_ahs_submit-894e51e9.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestMessage', 'bb days']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ers_ahs_submit-894e51e9.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ers_ahs_submit-894e51e9.request
deleted file mode 100644
index 9e5c63d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/ers_ahs_submit-894e51e9.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 292
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<TRIGGER_BB_DATA
->
-<MESSAGE_ID
- VALUE="TestMessage"
- />
-<BB_DAYS
- VALUE="bb days"
- />
-</TRIGGER_BB_DATA>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/factory_defaults-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/factory_defaults-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/factory_defaults-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/factory_defaults-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/factory_defaults-97d170e1.request
deleted file mode 100644
index c8c28e4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/factory_defaults-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 202
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<FACTORY_DEFAULTS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/fips_enable-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/fips_enable-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/fips_enable-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/fips_enable-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/fips_enable-97d170e1.request
deleted file mode 100644
index 3f12db9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/fips_enable-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 197
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<FIPS_ENABLE
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/force_format-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/force_format-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/force_format-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/force_format-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/force_format-97d170e1.request
deleted file mode 100644
index 541c958..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/force_format-97d170e1.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 212
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<FORCE_FORMAT
- VALUE="all"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status-97d170e1.request
deleted file mode 100644
index 3cd5f22..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 199
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_AHS_STATUS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status.raw
deleted file mode 100644
index 9464777..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ahs_status.raw	
+++ /dev/null
@@ -1,68 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:21 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0c8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESS
-020
-AGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_AHS_STATUS'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0
-062
-"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages-97d170e1.request
deleted file mode 100644
index 3e5d510..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 202
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_ALL_LANGUAGES
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages.parsed
deleted file mode 100644
index 4252de0..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-{'language_selection': {'lang_id': 'en', 'language': 'English'}}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages.raw
deleted file mode 100644
index 65de98c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_languages.raw	
+++ /dev/null
@@ -1,74 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:24 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0df
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-
-009
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_ALL_LANGUAGES>
-    <LANGUAGE_SELECTION 
-        LANG_ID = "en"  
-        LANGUAGE = "English"  
-    />
-</GET_ALL_LANGUAGES>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERS
-0c6
-ION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses-97d170e1.request
deleted file mode 100644
index 22720ff..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 201
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_ALL_LICENSES
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses.parsed
deleted file mode 100644
index f812a90..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses.parsed	
+++ /dev/null
@@ -1,4 +0,0 @@
-[{'license_class': 'FQL',
-  'license_install_date': 'Wed Mar  4 18:02:05 2015',
-  'license_key': 'XXXXX-XXXXX-XXXXX-XXXXX-XXXXX',
-  'license_type': 'iLO 3 Advanced'}]
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses.raw
deleted file mode 100644
index 385ee1f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_licenses.raw	
+++ /dev/null
@@ -1,81 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:27 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_ALL_LICENSES>
-    <LICENSE>
-         <LICENSE_TYPE VALUE= "iLO 3 Advanced"/>
-         <LICENSE_KEY VALUE= "XXXXX-XXXXX-XXXXX-XXXXX-XXXXX"/>
-         <LICENSE_INSTALL_D
-1d7
-ATE VALUE= "Wed Mar  4 18:02:05 2015"/>
-         <LICENSE_CLASS VALUE="FQL"/>
-    </LICENSE>
-</GET_ALL_LICENSES>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info-97d170e1.request
deleted file mode 100644
index 674ac97..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<USER_INFO
- MODE="read"
->
-<GET_ALL_USER_INFO
- />
-</USER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info.parsed
deleted file mode 100644
index 6f26533..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info.parsed	
+++ /dev/null
@@ -1,7 +0,0 @@
-{'Administrator': {'admin_priv': True,
-                   'config_ilo_priv': True,
-                   'remote_cons_priv': True,
-                   'reset_server_priv': True,
-                   'user_login': 'Administrator',
-                   'user_name': 'Administrator',
-                   'virtual_media_priv': True}}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info.raw
deleted file mode 100644
index 1baf11d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_user_info.raw	
+++ /dev/null
@@ -1,79 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:31 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_ALL_USER_INFO>
-<GET_USER
-    USER_NAME="Administrator"
-    USER_LOGIN="Administrator"
-    ADMIN_PRIV="Y"
-    REMOTE_CONS_PRIV="Y"
-    RESET_SERVER_PRIV="Y"
-    VIRTUAL
-0c2
-_MEDIA_PRIV="Y"
-    CONFIG_ILO_PRIV="Y"
-    />
-</GET_ALL_USER_INFO>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users-97d170e1.request
deleted file mode 100644
index a8e66e4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 200
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<USER_INFO
- MODE="read"
->
-<GET_ALL_USERS
- />
-</USER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users.parsed
deleted file mode 100644
index 9b07f2b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-['Administrator']
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users.raw
deleted file mode 100644
index f373624..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_all_users.raw	
+++ /dev/null
@@ -1,73 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:36 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-08d
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<R
-05b
-IBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-12a
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_ALL_USERS>
-    <USER_LOGIN VALUE="Administrator"/>
-</GET_ALL_USERS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-
-07d
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag-97d170e1.request
deleted file mode 100644
index 86160f4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_ASSET_TAG
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag.parsed
deleted file mode 100644
index 6fb7b2c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-{'asset_tag': None}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag.raw
deleted file mode 100644
index 8aa7dd9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_asset_tag.raw	
+++ /dev/null
@@ -1,89 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:42 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-06a
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-03a
-
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<R
-044
-ESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-001
-<
-096
-?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSI
-051
-ON="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-05c
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No 
-09c
-Asset Tag Information.'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-02a
-<?xml version="1.0"?>
-<RIBCL VERSION="2.2
-04a
-3">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info-97d170e1.request
deleted file mode 100644
index 0f85213..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 206
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_CERT_SUBJECT_INFO
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info.raw
deleted file mode 100644
index b91800c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_cert_subject_info.raw	
+++ /dev/null
@@ -1,68 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:47 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-041
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATU
-118
-S="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBC
-003
-L>
-
-1f4
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_CERT_SUBJECT_INFO'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode-97d170e1.request
deleted file mode 100644
index 1321337..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 212
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_CURRENT_BOOT_MODE
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode.raw
deleted file mode 100644
index c848e98..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_current_boot_mode.raw	
+++ /dev/null
@@ -1,78 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:53 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0c0
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-
-01f
-    MESSAGE='No error'
-     />
-
-009
-</RIBCL>
-
-011
-<?xml version="1.
-06e
-0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml versi
-0b5
-on="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-
-0b7
-    MESSAGE='Feature not supported - GET_CURRENT_BOOT_MODE'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-
-009
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config-97d170e1.request
deleted file mode 100644
index fd5b243..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 199
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<DIR_INFO
- MODE="read"
->
-<GET_DIR_CONFIG
- />
-</DIR_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config.parsed
deleted file mode 100644
index 63c532c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config.parsed	
+++ /dev/null
@@ -1,31 +0,0 @@
-{'dir_authentication_enabled': False,
- 'dir_enable_grp_acct': False,
- 'dir_grpacct1_name': 'Administrators',
- 'dir_grpacct1_priv': '1,2,3,4,5,6',
- 'dir_grpacct1_sid': '',
- 'dir_grpacct2_name': 'Authenticated Users',
- 'dir_grpacct2_priv': 6,
- 'dir_grpacct2_sid': 'S-1-5-11',
- 'dir_kerberos_enabled': False,
- 'dir_kerberos_kdc_address': '',
- 'dir_kerberos_kdc_port': 88,
- 'dir_kerberos_realm': '',
- 'dir_local_user_acct': True,
- 'dir_object_dn': '',
- 'dir_server_address': '',
- 'dir_server_port': 636,
- 'dir_user_context_1': '',
- 'dir_user_context_10': '',
- 'dir_user_context_11': '',
- 'dir_user_context_12': '',
- 'dir_user_context_13': '',
- 'dir_user_context_14': '',
- 'dir_user_context_15': '',
- 'dir_user_context_2': '',
- 'dir_user_context_3': '',
- 'dir_user_context_4': '',
- 'dir_user_context_5': '',
- 'dir_user_context_6': '',
- 'dir_user_context_7': '',
- 'dir_user_context_8': '',
- 'dir_user_context_9': ''}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config.raw
deleted file mode 100644
index d5caaf6..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_dir_config.raw	
+++ /dev/null
@@ -1,117 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:40:57 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-089
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-05f
-
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1bd
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_DIR_CONFIG>
-    <DIR_AUTHENTICATION_ENABLED VALUE="N"/>
-    <DIR_LOCAL_USER_ACCT VALUE="Y"/>
-    <DIR_SERVER_ADDRESS VALUE= ""/>
-    <DIR_SERVER_PORT VALUE= "636"/>
-    <DIR_OBJECT_DN VALUE= ""/>
-    <DIR_USER_CONTEXT_1 VALUE= ""/>
-    <DIR_USER_CONTEXT_2 VALUE= ""/>
-    <DIR_USER_CONTEXT_3 VALUE= ""/>
-    <DIR_USER_CONTEXT_4 VALUE
-07a
-= ""/>
-    <DIR_USER_CONTEXT_5 VALUE= ""/>
-    <DIR_USER_CONTEXT_6 VALUE= ""/>
-    <DIR_USER_CONTEXT_7 VALUE= ""/>
-    <DI
-10c
-R_USER_CONTEXT_8 VALUE= ""/>
-    <DIR_USER_CONTEXT_9 VALUE= ""/>
-    <DIR_USER_CONTEXT_10 VALUE= ""/>
-    <DIR_USER_CONTEXT_11 VALUE= ""/>
-    <DIR_USER_CONTEXT_12 VALUE= ""/>
-    <DIR_USER_CONTEXT_13 VALUE= ""/>
-    <DIR_USER_CONTEXT_14 VALUE= ""/>
-    <DIR_USER_CONT
-136
-EXT_15 VALUE= ""/>
-    <DIR_ENABLE_GRP_ACCT VALUE= "N"/>
-    <DIR_GRPACCT1_NAME VALUE= "Administrators"/>
-    <DIR_GRPACCT1_PRIV VALUE= "1,2,3,4,5,6"/>
-    <DIR_GRPACCT1_SID VALUE= ""/>
-    <DIR_GRPACCT2_NAME VALUE= "Authenticated Users"/>
-    <DIR_GRPACCT2_PRIV VALUE= "6"/>
-    <DIR_GRPACCT2_SID VALUE= "S-1-
-0bf
-5-11"/>
-    <DIR_KERBEROS_ENABLED VALUE="N"/>
-    <DIR_KERBEROS_REALM VALUE=""/>
-    <DIR_KERBEROS_KDC_ADDRESS VALUE= ""/>
-    <DIR_KERBEROS_KDC_PORT VALUE= "88"/>
-</GET_DIR_CONFIG>
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-00d
-<?xml version
-067
-="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health-97d170e1.request
deleted file mode 100644
index 15ff54a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 210
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_EMBEDDED_HEALTH
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health.parsed
deleted file mode 100644
index 25bd462..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health.parsed	
+++ /dev/null
@@ -1,194 +0,0 @@
-{'drives_backplanes': [{'drive_bays': {1: {'product_id': 'DG146BB976     ',
-                                           'status': 'Ok',
-                                           'uid_led': 'Off'},
-                                       2: {'product_id': 'DG146BB976     ',
-                                           'status': 'Ok',
-                                           'uid_led': 'Off'},
-                                       3: {'product_id': 'N/A',
-                                           'status': 'Not Present/Not Installed',
-                                           'uid_led': 'Off'},
-                                       4: {'product_id': 'N/A',
-                                           'status': 'Not Present/Not Installed',
-                                           'uid_led': 'Off'}},
-                        'enclosure_addr': '224',
-                        'firmware_version': '1.18'}],
- 'fans': {'Virtual Fan': {'label': 'Virtual Fan',
-                          'speed': (29, 'Percentage'),
-                          'status': 'OK',
-                          'zone': 'Virtual'}},
- 'firmware_information': {'CPLD - PAL0': 'ProLiant BL460c G7 System Programmable Logic Device version 0x13',
-                          'HP ProLiant System ROM': '05/05/2011',
-                          'HP ProLiant System ROM - Backup': '05/05/2011',
-                          'HP ProLiant System ROM Bootblock': '03/08/2010',
-                          'Power Management Controller': '1.6',
-                          'iLO': '1.82 Pass 4 Jan 15 2015'},
- 'health_at_a_glance': {'drive': {'status': 'OK'},
-                        'fans': {'status': 'OK'},
-                        'temperature': {'status': 'OK'},
-                        'vrm': {'status': 'OK'}},
- 'memory': {'memory_components': [[('memory_location',
-                                    {'value': 'PROC 1 DIMM 1D'}),
-                                   ('memory_size',
-                                    {'value': 'Not Installed'}),
-                                   ('memory_speed', {'value': '0 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 1 DIMM 2A'}),
-                                   ('memory_size', {'value': '4096 MB'}),
-                                   ('memory_speed', {'value': '1333 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 1 DIMM 3E'}),
-                                   ('memory_size',
-                                    {'value': 'Not Installed'}),
-                                   ('memory_speed', {'value': '0 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 1 DIMM 4B'}),
-                                   ('memory_size', {'value': '4096 MB'}),
-                                   ('memory_speed', {'value': '1333 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 1 DIMM 5F'}),
-                                   ('memory_size',
-                                    {'value': 'Not Installed'}),
-                                   ('memory_speed', {'value': '0 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 1 DIMM 6C'}),
-                                   ('memory_size', {'value': '4096 MB'}),
-                                   ('memory_speed', {'value': '1333 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 2 DIMM 1D'}),
-                                   ('memory_size',
-                                    {'value': 'Not Installed'}),
-                                   ('memory_speed', {'value': '0 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 2 DIMM 2A'}),
-                                   ('memory_size', {'value': '4096 MB'}),
-                                   ('memory_speed', {'value': '1333 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 2 DIMM 3E'}),
-                                   ('memory_size',
-                                    {'value': 'Not Installed'}),
-                                   ('memory_speed', {'value': '0 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 2 DIMM 4B'}),
-                                   ('memory_size', {'value': '4096 MB'}),
-                                   ('memory_speed', {'value': '1333 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 2 DIMM 5F'}),
-                                   ('memory_size',
-                                    {'value': 'Not Installed'}),
-                                   ('memory_speed', {'value': '0 MHz'})],
-                                  [('memory_location',
-                                    {'value': 'PROC 2 DIMM 6C'}),
-                                   ('memory_size', {'value': '4096 MB'}),
-                                   ('memory_speed', {'value': '1333 MHz'})]]},
- 'nic_information': {'NIC Port 1': {'mac_address': 'e4:11:5b:e0:14:58',
-                                    'network_port': 'Port 1'},
-                     'NIC Port 2': {'mac_address': 'e4:11:5b:e0:14:5c',
-                                    'network_port': 'Port 2'},
-                     'NIC Port 3': {'mac_address': 'e4:11:5b:e0:14:59',
-                                    'network_port': 'Port 3'},
-                     'NIC Port 4': {'mac_address': 'e4:11:5b:e0:14:5d',
-                                    'network_port': 'Port 4'},
-                     'iLO iLO Dedicated Network Port': {'mac_address': 'e4:11:5b:d3:ef:c3',
-                                                        'network_port': 'iLO Dedicated Network Port'},
-                     'iSCSI Port 1': {'mac_address': 'e4:11:5b:e0:14:59',
-                                      'network_port': 'Port 1'},
-                     'iSCSI Port 2': {'mac_address': 'e4:11:5b:e0:14:5d',
-                                      'network_port': 'Port 2'}},
- 'power_supplies': {},
- 'power_supply_summary': {'high_efficiency_mode': 'Balanced',
-                          'power_management_controller_firmware_version': '1.6',
-                          'present_power_reading': '109 Watts'},
- 'processors': {'Proc 1': {'execution_technology': '6/6 cores; 12 threads',
-                           'internal_l1_cache': '192 KB',
-                           'internal_l2_cache': '1536 KB',
-                           'internal_l3_cache': '12288 KB',
-                           'label': 'Proc 1',
-                           'memory_technology': '64-bit Capable',
-                           'speed': '2267 MHz'},
-                'Proc 2': {'execution_technology': '6/6 cores; 12 threads',
-                           'internal_l1_cache': '192 KB',
-                           'internal_l2_cache': '1536 KB',
-                           'internal_l3_cache': '12288 KB',
-                           'label': 'Proc 2',
-                           'memory_technology': '64-bit Capable',
-                           'speed': '2267 MHz'}},
- 'temperature': {'01-Inlet Ambient': {'caution': (42, 'Celsius'),
-                                      'critical': (46, 'Celsius'),
-                                      'currentreading': (20, 'Celsius'),
-                                      'label': '01-Inlet Ambient',
-                                      'location': 'Ambient',
-                                      'status': 'OK'},
-                 '02-CPU 1': {'caution': (82, 'Celsius'),
-                              'critical': (83, 'Celsius'),
-                              'currentreading': (40, 'Celsius'),
-                              'label': '02-CPU 1',
-                              'location': 'CPU',
-                              'status': 'OK'},
-                 '03-CPU 2': {'caution': (82, 'Celsius'),
-                              'critical': (83, 'Celsius'),
-                              'currentreading': (40, 'Celsius'),
-                              'label': '03-CPU 2',
-                              'location': 'CPU',
-                              'status': 'OK'},
-                 '04-DIMMs 1': {'caution': (87, 'Celsius'),
-                                'critical': (92, 'Celsius'),
-                                'currentreading': (37, 'Celsius'),
-                                'label': '04-DIMMs 1',
-                                'location': 'Memory',
-                                'status': 'OK'},
-                 '05-DIMMs 2': {'caution': (87, 'Celsius'),
-                                'critical': (92, 'Celsius'),
-                                'currentreading': (40, 'Celsius'),
-                                'label': '05-DIMMs 2',
-                                'location': 'Memory',
-                                'status': 'OK'},
-                 '06-HDD Max': {'caution': (60, 'Celsius'),
-                                'critical': (65, 'Celsius'),
-                                'currentreading': (35, 'Celsius'),
-                                'label': '06-HDD Max',
-                                'location': 'Storage',
-                                'status': 'OK'},
-                 '07-Memory 1 1-6': {'caution': (81, 'Celsius'),
-                                     'critical': (86, 'Celsius'),
-                                     'currentreading': (37, 'Celsius'),
-                                     'label': '07-Memory 1 1-6',
-                                     'location': 'Memory',
-                                     'status': 'OK'},
-                 '08-Memory 2 1-6': {'caution': (81, 'Celsius'),
-                                     'critical': (86, 'Celsius'),
-                                     'currentreading': (44, 'Celsius'),
-                                     'label': '08-Memory 2 1-6',
-                                     'location': 'Memory',
-                                     'status': 'OK'},
-                 '09-IOH': {'caution': (105, 'Celsius'),
-                            'critical': (110, 'Celsius'),
-                            'currentreading': (61, 'Celsius'),
-                            'label': '09-IOH',
-                            'location': 'I/O Board',
-                            'status': 'OK'},
-                 '10-Mezz Zone': {'caution': (81, 'Celsius'),
-                                  'critical': (86, 'Celsius'),
-                                  'currentreading': (46, 'Celsius'),
-                                  'label': '10-Mezz Zone',
-                                  'location': 'I/O Board',
-                                  'status': 'OK'},
-                 '11-CNA Zone': {'caution': (81, 'Celsius'),
-                                 'critical': (86, 'Celsius'),
-                                 'currentreading': (35, 'Celsius'),
-                                 'label': '11-CNA Zone',
-                                 'location': 'I/O Board',
-                                 'status': 'OK'},
-                 '12-Chassis Exit': {'caution': (70, 'Celsius'),
-                                     'critical': (75, 'Celsius'),
-                                     'currentreading': (35, 'Celsius'),
-                                     'label': '12-Chassis Exit',
-                                     'location': 'System',
-                                     'status': 'OK'},
-                 '13-Chassis Exit': {'caution': (70, 'Celsius'),
-                                     'critical': (75, 'Celsius'),
-                                     'currentreading': (21, 'Celsius'),
-                                     'label': '13-Chassis Exit',
-                                     'location': 'System',
-                                     'status': 'OK'}},
- 'vrm': {'VRM 1': {'label': 'VRM 1', 'status': 'OK'},
-         'VRM 2': {'label': 'VRM 2', 'status': 'OK'}}}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health.raw
deleted file mode 100644
index 11cf98b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_embedded_health.raw	
+++ /dev/null
@@ -1,430 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:02 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e4
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIB
-004
-CL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_EMBEDDED_HEALTH_DATA>
-    <FANS>
-       <FAN>
-            <ZONE VALUE = "Virtual"/>
-            <LABEL VALUE = "Virtual Fan"/>
-            <STATUS VALUE = "OK"/>
-     
-1ff
-           <SPEED VALUE = "29" UNIT="Percentage"/>
-       </FAN>
-    </FANS>
-    <TEMPERATURE>
-       <TEMP>
-            <LABEL VALUE = "01-Inlet Ambient"/>
-            <LOCATION VALUE = "Ambient"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "20" UNIT="Celsius"/>
-            <CAUTION VALUE = "42" UNIT="Celsius"/>
-            <CRITICAL VALUE = "46" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "02-CPU 1"/>
-            <LOCATION VALUE = "CPU"/>
-         
-1ff
-   <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "40" UNIT="Celsius"/>
-            <CAUTION VALUE = "82" UNIT="Celsius"/>
-            <CRITICAL VALUE = "83" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "03-CPU 2"/>
-            <LOCATION VALUE = "CPU"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "40" UNIT="Celsius"/>
-            <CAUTION VALUE = "82" UNIT="Celsius"/>
-            <CRITICAL VALUE = "83" UNIT="Celsius"/>
-       </TEMP>
-      
-1ff
- <TEMP>
-            <LABEL VALUE = "04-DIMMs 1"/>
-            <LOCATION VALUE = "Memory"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "37" UNIT="Celsius"/>
-            <CAUTION VALUE = "87" UNIT="Celsius"/>
-            <CRITICAL VALUE = "92" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "05-DIMMs 2"/>
-            <LOCATION VALUE = "Memory"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "40" UNIT="Celsius"/>
-            <CAUTIO
-003
-N V
-1ff
-ALUE = "87" UNIT="Celsius"/>
-            <CRITICAL VALUE = "92" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "06-HDD Max"/>
-            <LOCATION VALUE = "Storage"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "35" UNIT="Celsius"/>
-            <CAUTION VALUE = "60" UNIT="Celsius"/>
-            <CRITICAL VALUE = "65" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "07-Memory 1 1-6"/>
-            <LOCATION VALUE = "Memory"/>
-    
-1ff
-        <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "37" UNIT="Celsius"/>
-            <CAUTION VALUE = "81" UNIT="Celsius"/>
-            <CRITICAL VALUE = "86" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "08-Memory 2 1-6"/>
-            <LOCATION VALUE = "Memory"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "44" UNIT="Celsius"/>
-            <CAUTION VALUE = "81" UNIT="Celsius"/>
-            <CRITICAL VALUE = "86" UNIT="Celsius"/>
-      
-1ff
- </TEMP>
-       <TEMP>
-            <LABEL VALUE = "09-IOH"/>
-            <LOCATION VALUE = "I/O Board"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "61" UNIT="Celsius"/>
-            <CAUTION VALUE = "105" UNIT="Celsius"/>
-            <CRITICAL VALUE = "110" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "10-Mezz Zone"/>
-            <LOCATION VALUE = "I/O Board"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "46" UNIT="Celsius"/
-1ff
->
-            <CAUTION VALUE = "81" UNIT="Celsius"/>
-            <CRITICAL VALUE = "86" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "11-CNA Zone"/>
-            <LOCATION VALUE = "I/O Board"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "35" UNIT="Celsius"/>
-            <CAUTION VALUE = "81" UNIT="Celsius"/>
-            <CRITICAL VALUE = "86" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "12-Chassis Exit"/>
-            <LOCAT
-003
-ION
-1ff
- VALUE = "System"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "35" UNIT="Celsius"/>
-            <CAUTION VALUE = "70" UNIT="Celsius"/>
-            <CRITICAL VALUE = "75" UNIT="Celsius"/>
-       </TEMP>
-       <TEMP>
-            <LABEL VALUE = "13-Chassis Exit"/>
-            <LOCATION VALUE = "System"/>
-            <STATUS VALUE = "OK"/>
-            <CURRENTREADING VALUE = "21" UNIT="Celsius"/>
-            <CAUTION VALUE = "70" UNIT="Celsius"/>
-            <CRITICAL VALUE = "75"
-1ae
- UNIT="Celsius"/>
-       </TEMP>
-    </TEMPERATURE>
-    <POWER_SUPPLIES>
-       <POWER_SUPPLY_SUMMARY>
-            <PRESENT_POWER_READING VALUE = "109 Watts"/>
-            <POWER_MANAGEMENT_CONTROLLER_FIRMWARE_VERSION VALUE = "1.6"/>
-            <HIGH_EFFICIENCY_MODE VALUE = "Balanced"/>
-       </POWER_SUPPLY_SUMMARY>
-    </POWER_SUPPLIES>
-    <VRM>
-      <MODULE>
-            <LABEL VALUE = "VRM 1"/>
-            <STATUS VALUE 
-1ff
-= "OK"/>
-      </MODULE>
-      <MODULE>
-            <LABEL VALUE = "VRM 2"/>
-            <STATUS VALUE = "OK"/>
-      </MODULE>
-    </VRM>
-    <PROCESSORS>
-       <PROCESSOR>
-            <LABEL VALUE = "Proc 1"/>
-            <SPEED VALUE = "2267 MHz"/>
-            <EXECUTION_TECHNOLOGY VALUE = "6/6 cores; 12 threads"/>
-            <MEMORY_TECHNOLOGY VALUE = "64-bit Capable"/>
-            <INTERNAL_L1_CACHE VALUE = "192 KB"/>
-            <INTERNAL_L2_CACHE VALUE = "1536 KB"/>
-            <INTERNAL_L3_CACHE 
-1ff
-VALUE = "12288 KB"/>
-       </PROCESSOR>
-       <PROCESSOR>
-            <LABEL VALUE = "Proc 2"/>
-            <SPEED VALUE = "2267 MHz"/>
-            <EXECUTION_TECHNOLOGY VALUE = "6/6 cores; 12 threads"/>
-            <MEMORY_TECHNOLOGY VALUE = "64-bit Capable"/>
-            <INTERNAL_L1_CACHE VALUE = "192 KB"/>
-            <INTERNAL_L2_CACHE VALUE = "1536 KB"/>
-            <INTERNAL_L3_CACHE VALUE = "12288 KB"/>
-       </PROCESSOR>
-    </PROCESSORS>
-    <MEMORY>
-       <MEMORY_COMPONENTS>
-            <MEM
-1ff
-ORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 1 DIMM 1D"/>
-                <MEMORY_SIZE VALUE = "Not Installed"/>
-                <MEMORY_SPEED VALUE = "0 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 1 DIMM 2A"/>
-                <MEMORY_SIZE VALUE = "4096 MB"/>
-                <MEMORY_SPEED VALUE = "1333 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 
-1ff
-1 DIMM 3E"/>
-                <MEMORY_SIZE VALUE = "Not Installed"/>
-                <MEMORY_SPEED VALUE = "0 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 1 DIMM 4B"/>
-                <MEMORY_SIZE VALUE = "4096 MB"/>
-                <MEMORY_SPEED VALUE = "1333 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 1 DIMM 5F"/>
-                <MEMORY_SIZE VALUE = "Not Install
-1ff
-ed"/>
-                <MEMORY_SPEED VALUE = "0 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 1 DIMM 6C"/>
-                <MEMORY_SIZE VALUE = "4096 MB"/>
-                <MEMORY_SPEED VALUE = "1333 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 2 DIMM 1D"/>
-                <MEMORY_SIZE VALUE = "Not Installed"/>
-                <MEMORY_SPEED VALUE = "0 MHz"/>
-        
-1ff
-    </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 2 DIMM 2A"/>
-                <MEMORY_SIZE VALUE = "4096 MB"/>
-                <MEMORY_SPEED VALUE = "1333 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 2 DIMM 3E"/>
-                <MEMORY_SIZE VALUE = "Not Installed"/>
-                <MEMORY_SPEED VALUE = "0 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-       
-0fc
-         <MEMORY_LOCATION VALUE = "PROC 2 DIMM 4B"/>
-                <MEMORY_SIZE VALUE = "4096 MB"/>
-                <MEMORY_SPEED VALUE = "1333 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VAL
-1ff
-UE = "PROC 2 DIMM 5F"/>
-                <MEMORY_SIZE VALUE = "Not Installed"/>
-                <MEMORY_SPEED VALUE = "0 MHz"/>
-            </MEMORY_COMPONENT>
-            <MEMORY_COMPONENT>
-                <MEMORY_LOCATION VALUE = "PROC 2 DIMM 6C"/>
-                <MEMORY_SIZE VALUE = "4096 MB"/>
-                <MEMORY_SPEED VALUE = "1333 MHz"/>
-            </MEMORY_COMPONENT>
-       </MEMORY_COMPONENTS>
-    </MEMORY>
-    <NIC_INFOMATION>
-       <NIC>
-            <NETWORK_PORT VALUE = "Port 1"/>
-        
-1ff
-    <MAC_ADDRESS VALUE = "e4:11:5b:e0:14:58"/>
-       </NIC>
-       <NIC>
-            <NETWORK_PORT VALUE = "Port 2"/>
-            <MAC_ADDRESS VALUE = "e4:11:5b:e0:14:5c"/>
-       </NIC>
-       <NIC>
-            <NETWORK_PORT VALUE = "Port 3"/>
-            <MAC_ADDRESS VALUE = "e4:11:5b:e0:14:59"/>
-       </NIC>
-       <NIC>
-            <NETWORK_PORT VALUE = "Port 4"/>
-            <MAC_ADDRESS VALUE = "e4:11:5b:e0:14:5d"/>
-       </NIC>
-       <iLO>
-            <NETWORK_PORT VALUE = "iLO Dedicated Network
-1ff
- Port"/>
-            <MAC_ADDRESS VALUE = "e4:11:5b:d3:ef:c3"/>
-       </iLO>
-       <iSCSI>
-            <NETWORK_PORT VALUE = "Port 1"/>
-            <MAC_ADDRESS VALUE = "e4:11:5b:e0:14:59"/>
-       </iSCSI>
-       <iSCSI>
-            <NETWORK_PORT VALUE = "Port 2"/>
-            <MAC_ADDRESS VALUE = "e4:11:5b:e0:14:5d"/>
-       </iSCSI>
-    </NIC_INFOMATION>
-    <FIRMWARE_INFORMATION>
-       <INDEX_1>
-            <FIRMWARE_NAME VALUE = "HP ProLiant System ROM"/>
-            <FIRMWARE_VERSION VALUE = "05/0
-1ff
-5/2011"/>
-       </INDEX_1>
-       <INDEX_2>
-            <FIRMWARE_NAME VALUE = "HP ProLiant System ROM - Backup"/>
-            <FIRMWARE_VERSION VALUE = "05/05/2011"/>
-       </INDEX_2>
-       <INDEX_3>
-            <FIRMWARE_NAME VALUE = "HP ProLiant System ROM Bootblock"/>
-            <FIRMWARE_VERSION VALUE = "03/08/2010"/>
-       </INDEX_3>
-       <INDEX_4>
-            <FIRMWARE_NAME VALUE = "iLO"/>
-            <FIRMWARE_VERSION VALUE = "1.82 Pass 4 Jan 15 2015"/>
-       </INDEX_4>
-       <INDEX_5>
-   
-1ff
-         <FIRMWARE_NAME VALUE = "Power Management Controller"/>
-            <FIRMWARE_VERSION VALUE = "1.6"/>
-       </INDEX_5>
-       <INDEX_6>
-            <FIRMWARE_NAME VALUE = "CPLD - PAL0"/>
-            <FIRMWARE_VERSION VALUE = "ProLiant BL460c G7 System Programmable Logic Device version 0x13"/>
-       </INDEX_6>
-    </FIRMWARE_INFORMATION>
-    <DRIVES>
-       <BACKPLANE>
-            <FIRMWARE_VERSION VALUE="1.18"/>
-            <ENCLOSURE_ADDR VALUE="224"/>
-            <DRIVE_BAY VALUE = "1"/>
-      
-1c7
-          <PRODUCT_ID VALUE = "DG146BB976     "/>
-                <STATUS VALUE = "Ok"/>
-                <UID_LED VALUE = "Off"/>
-            <DRIVE_BAY VALUE = "2"/>
-                <PRODUCT_ID VALUE = "DG146BB976     "/>
-                <STATUS VALUE = "Ok"/>
-                <UID_LED VALUE = "Off"/>
-            <DRIVE_BAY VALUE = "3"/>
-                <PRODUCT_ID VALUE = "N/A"/>
-                <STATUS VALUE = "Not Present/Not Installed"/>
-         
-151
-       <UID_LED VALUE = "Off"/>
-            <DRIVE_BAY VALUE = "4"/>
-                <PRODUCT_ID VALUE = "N/A"/>
-                <STATUS VALUE = "Not Present/Not Installed"/>
-                <UID_LED VALUE = "Off"/>
-       </BACKPLANE>
-    </DRIVES>
-    <HEALTH_AT_A_GLANCE>
-       <FANS STATUS= "OK"/>
-       <TEMPERATURE STATUS= "OK"/>
-161
-
-       <VRM STATUS= "OK"/>
-       <DRIVE STATUS= "OK"/>
-    </HEALTH_AT_A_GLANCE>
-</GET_EMBEDDED_HEALTH_DATA>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-040
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STAT
-034
-US="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings-97d170e1.request
deleted file mode 100644
index c705690..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 205
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_ENCRYPT_SETTINGS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings.raw
deleted file mode 100644
index 8141186..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_encrypt_settings.raw	
+++ /dev/null
@@ -1,70 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:08 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0a8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPO
-040
-NSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0f5
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version
-0a0
-="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_ENCRYPT_SETTINGS'
-    />
-</RIBCL>
-<?xml version="1.0"?>

-0d2
-
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings-97d170e1.request
deleted file mode 100644
index c301fe0..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 201
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_ERS_SETTINGS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings.raw
deleted file mode 100644
index 04e5fbc..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ers_settings.raw	
+++ /dev/null
@@ -1,66 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:11 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ef
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_ERS_SETTINGS'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups-97d170e1.request
deleted file mode 100644
index 1baca70..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 210
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_FEDERATION_ALL_GROUPS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups.raw
deleted file mode 100644
index f23458b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups.raw	
+++ /dev/null
@@ -1,50 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:14 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-192
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0001"
-    MESSAGE='Error: Line #11: syntax error near "GET_FEDERATION_ALL_GROUPS".'
-    />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info-97d170e1.request
deleted file mode 100644
index 6b6720a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 215
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_FEDERATION_ALL_GROUPS_INFO
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info.raw
deleted file mode 100644
index 81398fc..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_all_groups_info.raw	
+++ /dev/null
@@ -1,52 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:18 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0c9
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSA
-01f
-GE='No error'
-     />
-</RIBCL>
-
-197
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0001"
-    MESSAGE='Error: Line #11: syntax error near "GET_FEDERATION_ALL_GROUPS_INFO".'
-    />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group-4badb3d7.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group-4badb3d7.args
deleted file mode 100644
index 7176fbd..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group-4badb3d7.args	
+++ /dev/null
@@ -1 +0,0 @@
-['slartibartfast']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group-4badb3d7.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group-4badb3d7.request
deleted file mode 100644
index 3c3ea54..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group-4badb3d7.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 235
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_FEDERATION_GROUP
- GROUP_NAME="slartibartfast"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group.raw
deleted file mode 100644
index 2e908fb..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_group.raw	
+++ /dev/null
@@ -1,50 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:21 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-18d
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0001"
-    MESSAGE='Error: Line #11: syntax error near "GET_FEDERATION_GROUP".'
-    />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast-97d170e1.request
deleted file mode 100644
index aff7ddf..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 209
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_FEDERATION_MULTICAST
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast.raw
deleted file mode 100644
index fe872f6..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_federation_multicast.raw	
+++ /dev/null
@@ -1,52 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:26 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-02b
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23
-0bd
-">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-191
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0001"
-    MESSAGE='Error: Line #11: syntax error near "GET_FEDERATION_MULTICAST".'
-    />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status-97d170e1.request
deleted file mode 100644
index 1828e04..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 200
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_FIPS_STATUS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status.parsed
deleted file mode 100644
index 8cc7af8..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-{'fips_mode': 'Disabled'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status.raw
deleted file mode 100644
index 5b3f234..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fips_status.raw	
+++ /dev/null
@@ -1,76 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:29 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_FIPS_STATUS>
-    <FIPS_MODE VALUE="Disabled"/>
-</GET_FIPS_STATUS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No
-101
- error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version-97d170e1.request
deleted file mode 100644
index d9f0b09..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 199
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_FW_VERSION
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version.parsed
deleted file mode 100644
index 88d3355..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version.parsed	
+++ /dev/null
@@ -1,4 +0,0 @@
-{'firmware_date': 'Jan 15 2015',
- 'firmware_version': '1.82',
- 'license_type': 'iLO 3 Advanced',
- 'management_processor': 'iLO3'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version.raw
deleted file mode 100644
index 6d11a79..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_fw_version.raw	
+++ /dev/null
@@ -1,78 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:33 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e1
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</
-007
-RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-172
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_FW_VERSION
-   FIRMWARE_VERSION = "1.82"
-   FIRMWARE_DATE = "Jan 15 2015"
-   MANAGEMENT_PROCESSOR = "iLO3"
-   LICENSE_TYPE = "iLO 3 Advanced"
- 
-083
-   />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings-97d170e1.request
deleted file mode 100644
index a5ac03d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_GLOBAL_SETTINGS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings.parsed
deleted file mode 100644
index 5d84fb0..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings.parsed	
+++ /dev/null
@@ -1,17 +0,0 @@
-{'authentication_failure_logging': 'Enabled-every 3rd failure',
- 'enforce_aes': False,
- 'f8_login_required': False,
- 'f8_prompt_enabled': True,
- 'http_port': 80,
- 'https_port': 443,
- 'ipmi_dcmi_over_lan_enabled': True,
- 'min_password': 8,
- 'propagate_time_to_host': True,
- 'rbsu_post_ip': True,
- 'remote_console_port': 17990,
- 'serial_cli_speed': 9600,
- 'serial_cli_status': 'Enabled-Authentication Required',
- 'session_timeout': 30,
- 'ssh_port': 22,
- 'ssh_status': True,
- 'virtual_media_port': 17988}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings.raw
deleted file mode 100644
index 6c0b9e6..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_global_settings.raw	
+++ /dev/null
@@ -1,102 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:39 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-079
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml
-06f
- version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-06b
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-
-009
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_GLOBAL_SETTINGS>
-    <SESSION_TIMEOUT VALUE="30"/>
-    <F8_PROMPT_ENABLED VALUE="Y"/>
-    <F8_LOGIN_REQUIRED VALUE="N"/>
-    <HTTPS_PORT VALUE="443"/>
-    <HTTP_PORT VALUE="80"/>
-    <REMOTE_CONSOLE_PORT VALUE="17990"/>
-    <VIRTUAL_MEDIA_PORT VALUE="17988"/>
-    <SSH_PORT VALUE="22"/>
-    <SSH_STATUS VALUE="Y"/>
-    <SERIAL_CLI_STATUS VALUE="Enabled-Authentication Required"/>
-    <SERIAL_CLI_SPE
-1ff
-ED VALUE="9600"/>
-    <MIN_PASSWORD VALUE="8"/>
-    <AUTHENTICATION_FAILURE_LOGGING VALUE="Enabled-every 3rd failure"/>
-    <RBSU_POST_IP VALUE="Y"/>
-    <ENFORCE_AES VALUE="N"/>
-    <IPMI_DCMI_OVER_LAN_ENABLED VALUE="Y"/>
-    <PROPAGATE_TIME_TO_HOST VALUE="Y"/>
-</GET_GLOBAL_SETTINGS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-
-085
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data-97d170e1.request
deleted file mode 100644
index 90600a3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_HOST_DATA
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data.parsed
deleted file mode 100644
index 2cb0782..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data.parsed	
+++ /dev/null
@@ -1,98 +0,0 @@
-[{'Date': '05/05/2011',
-  'Family': 'I27',
-  'b64_data': 'ABgAAAECAPADf4DayX0AAAAAAwf//wEaSFAASTI3ADA1LzA1LzIwMTEAAA==',
-  'type': 0},
- {'Product Name': 'ProLiant BL460c G7',
-  'Serial Number': 'CZ320580J3      ',
-  'UUID': '603718CZ320580J3',
-  'b64_data': 'ARsAAQQFAAE2MDM3MThDWjMyMDU4MEozBgIDQ1ozMjA1ODBKMyAgICAgIAA2MDM3MTgtQjIxICAgICAgAFByb0xpYW50AEhQAFByb0xpYW50IEJMNDYwYyBHNwAgICAgICAgICAgICAgICAAAA==',
-  'cUUID': '37333036-3831-5A43-3332-303538304A33',
-  'type': 1},
- {'Execution Technology': '6 of 6 cores; 12 threads',
-  'Label': 'Proc 1',
-  'Memory Technology': '64-bit Capable',
-  'Speed': '2267 MHz',
-  'b64_data': 'BCoABAEDswLCBgIA//vrvwOOhQDAEtsIQRkQByAHMAcAAAAGBgwEALMAUHJvYyAxAEludGVsAEludGVsKFIpIFhlb24oUikgQ1BVIEw1NjQwIEAgMi4yN0dIeiAgICAgICAgICAgIAAA',
-  'type': 4},
- {'Execution Technology': '6 of 6 cores; 12 threads',
-  'Label': 'Proc 2',
-  'Memory Technology': '64-bit Capable',
-  'Speed': '2267 MHz',
-  'b64_data': 'BCoGBAEDswLCBgIA//vrvwOOhQDAEtsIRBkWByYHNgcAAAAGBgwEALMAUHJvYyAyAEludGVsAEludGVsKFIpIFhlb24oUikgQ1BVIEw1NjQwIEAgMi4yN0dIeiAgICAgICAgICAgIAAA',
-  'type': 4},
- {'Label': 'PROC 1 DIMM 1D',
-  'Size': 'not installed',
-  'b64_data': 'ESIAEQAQ/v9IAEAAAAAJAQEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMSBESU1NIDFEAAA=',
-  'type': 17},
- {'Label': 'PROC 1 DIMM 2A',
-  'Size': '4096 MB',
-  'Speed': '1333 MHz',
-  'b64_data': 'ESIBEQAQ/v9IAEAAABAJAgEAGIAANQUAAAAAAgAAAAA1BVBST0MgMSBESU1NIDJBAAA=',
-  'type': 17},
- {'Label': 'PROC 1 DIMM 3E',
-  'Size': 'not installed',
-  'b64_data': 'ESICEQAQ/v9IAEAAAAAJAwEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMSBESU1NIDNFAAA=',
-  'type': 17},
- {'Label': 'PROC 1 DIMM 4B',
-  'Size': '4096 MB',
-  'Speed': '1333 MHz',
-  'b64_data': 'ESIDEQAQ/v9IAEAAABAJBAEAGIAANQUAAAAAAgAAAAA1BVBST0MgMSBESU1NIDRCAAA=',
-  'type': 17},
- {'Label': 'PROC 1 DIMM 5F',
-  'Size': 'not installed',
-  'b64_data': 'ESIEEQAQ/v9IAEAAAAAJBQEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMSBESU1NIDVGAAA=',
-  'type': 17},
- {'Label': 'PROC 1 DIMM 6C',
-  'Size': '4096 MB',
-  'Speed': '1333 MHz',
-  'b64_data': 'ESIFEQAQ/v9IAEAAABAJBgEAGIAANQUAAAAAAgAAAAA1BVBST0MgMSBESU1NIDZDAAA=',
-  'type': 17},
- {'Label': 'PROC 2 DIMM 1D',
-  'Size': 'not installed',
-  'b64_data': 'ESIGEQEQ/v9IAEAAAAAJBwEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMiBESU1NIDFEAAA=',
-  'type': 17},
- {'Label': 'PROC 2 DIMM 2A',
-  'Size': '4096 MB',
-  'Speed': '1333 MHz',
-  'b64_data': 'ESIHEQEQ/v9IAEAAABAJCAEAGIAANQUAAAAAAgAAAAA1BVBST0MgMiBESU1NIDJBAAA=',
-  'type': 17},
- {'Label': 'PROC 2 DIMM 3E',
-  'Size': 'not installed',
-  'b64_data': 'ESIIEQEQ/v9IAEAAAAAJCQEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMiBESU1NIDNFAAA=',
-  'type': 17},
- {'Label': 'PROC 2 DIMM 4B',
-  'Size': '4096 MB',
-  'Speed': '1333 MHz',
-  'b64_data': 'ESIJEQEQ/v9IAEAAABAJCgEAGIAANQUAAAAAAgAAAAA1BVBST0MgMiBESU1NIDRCAAA=',
-  'type': 17},
- {'Label': 'PROC 2 DIMM 5F',
-  'Size': 'not installed',
-  'b64_data': 'ESIKEQEQ/v9IAEAAAAAJCwEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMiBESU1NIDVGAAA=',
-  'type': 17},
- {'Label': 'PROC 2 DIMM 6C',
-  'Size': '4096 MB',
-  'Speed': '1333 MHz',
-  'b64_data': 'ESILEQEQ/v9IAEAAABAJDAEAGIAANQUAAAAAAgAAAAA1BVBST0MgMiBESU1NIDZDAAA=',
-  'type': 17},
- {'b64_data': '0SQA0QAC5BFb4BRYAQLkEVvgFFwCAuQRW+AUWQMC5BFb4BRdAAA=',
-  'fields': [{'name': 'Port', 'value': 1},
-             {'name': 'MAC', 'value': 'E4-11-5B-E0-14-58'},
-             {'name': 'Port', 'value': 2},
-             {'name': 'MAC', 'value': 'E4-11-5B-E0-14-5C'},
-             {'name': 'Port', 'value': 3},
-             {'name': 'MAC', 'value': 'E4-11-5B-E0-14-59'},
-             {'name': 'Port', 'value': 4},
-             {'name': 'MAC', 'value': 'E4-11-5B-E0-14-5D'},
-             {'name': 'Port', 'value': 'iLO'},
-             {'name': 'MAC', 'value': 'E4-11-5B-D3-EF-C3'}],
-  'type': 209},
- {'b64_data': '3RQA3QIC5BFb4BRZAwLkEVvgFF0AAA==',
-  'fields': [{'name': 'Port', 'value': 1},
-             {'name': 'MAC', 'value': 'E4-11-5B-E0-14-59'},
-             {'name': 'Port', 'value': 2},
-             {'name': 'MAC', 'value': 'E4-11-5B-E0-14-5D'}],
-  'type': 221},
- {'Serial Number': 'CZ320580J3      ',
-  'b64_data': '4hUA4jYwMzcxOENaMzIwNTgwSjMBQ1ozMjA1ODBKMyAgICAgIAAA',
-  'cUUID': '37333036-3831-5A43-3332-303538304A33',
-  'type': 226}]
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data.raw
deleted file mode 100644
index 593b0e7..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_data.raw	
+++ /dev/null
@@ -1,314 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:43 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0d5
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error
-013
-'
-     />
-</RIBCL>
-
-06f
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RI
-058
-BCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MES
-021
-SAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_HOST_DATA>
- <SMBIOS_RECORD TYPE="0" B64_DATA="ABgAAAECAPADf4DayX0AAAAAAwf//wEaSFAASTI3ADA1LzA1LzIwMTEAAA==">
-  <FIELD NAME="Family" VALUE="I27"/>
-  <FIELD NAME="Date" VALUE="05/05/2011"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="1" B64_DATA="ARsAAQQFAAE2MDM3MThDWjMyMDU4MEozBgIDQ1ozMjA1ODBKMyAgICAgIAA2MDM3MTgtQjIxICAgICAgAFByb0xpYW50AEhQAFByb0xpYW50IEJMNDYwYyBHNwAgICAgICAgICAgICAgICAAAA==">
-  <FIELD
-1ff
- NAME="Product Name" VALUE="ProLiant BL460c G7"/>
-  <FIELD NAME="Serial Number" VALUE="CZ320580J3      "/>
-  <FIELD NAME="UUID" VALUE="603718CZ320580J3"/>
-  <FIELD NAME="cUUID" VALUE="37333036-3831-5A43-3332-303538304A33"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="3" B64_DATA="AxEAAwEcAAIDAwMDAgAAAABIUABDWjMxMTFBRDMzICAgACAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgAAA=" />
- <SMBIOS_RECORD TYPE="4" B64_DATA="BCoABAEDswLCBgIA//vrvwOOhQDAEtsIQRkQByAHMAcAAAAGBgwEALMAUHJvYyAxAEludGVsAEludGVsKFIpIFhlb24oUikgQ1BVIE
-1ff
-w1NjQwIEAgMi4yN0dIeiAgICAgICAgICAgIAAA">
-  <FIELD NAME="Label" VALUE="Proc 1"/>
-  <FIELD NAME="Speed" VALUE="2267 MHz"/>
-  <FIELD NAME="Execution Technology" VALUE="6 of 6 cores; 12 threads"/>
-  <FIELD NAME="Memory Technology" VALUE="64-bit Capable"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="4" B64_DATA="BCoGBAEDswLCBgIA//vrvwOOhQDAEtsIRBkWByYHNgcAAAAGBgwEALMAUHJvYyAyAEludGVsAEludGVsKFIpIFhlb24oUikgQ1BVIEw1NjQwIEAgMi4yN0dIeiAgICAgICAgICAgIAAA">
-  <FIELD NAME="Label" VALUE="Proc 2"/>
-  <FIELD NAME="Speed" VA
-1ff
-LUE="2267 MHz"/>
-  <FIELD NAME="Execution Technology" VALUE="6 of 6 cores; 12 threads"/>
-  <FIELD NAME="Memory Technology" VALUE="64-bit Capable"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="7" B64_DATA="BxMQBwGAAcAAwAAIAAgAAAUEB1Byb2Nlc3NvciAxIEludGVybmFsIEwxIENhY2hlAAA=" />
- <SMBIOS_RECORD TYPE="7" B64_DATA="BxMWBwGAAcAAwAAIAAgAAAUEB1Byb2Nlc3NvciAyIEludGVybmFsIEwxIENhY2hlAAA=" />
- <SMBIOS_RECORD TYPE="7" B64_DATA="BxMgBwGBARiAGIAIAAgAAAUCB1Byb2Nlc3NvciAxIEludGVybmFsIEwyIENhY2hlAAA=" />
- <SMBIOS_RECORD TYPE=
-003
-"7"
-1ff
- B64_DATA="BxMmBwGBARiAGIAIAAgAAAUCB1Byb2Nlc3NvciAyIEludGVybmFsIEwyIENhY2hlAAA=" />
- <SMBIOS_RECORD TYPE="7" B64_DATA="BxMwBwGCAcCAwIAIAAgAAAUCCFByb2Nlc3NvciAxIEludGVybmFsIEwzIENhY2hlAAA=" />
- <SMBIOS_RECORD TYPE="7" B64_DATA="BxM2BwGCAcCAwIAIAAgAAAUCCFByb2Nlc3NvciAyIEludGVybmFsIEwzIENhY2hlAAA=" />
- <SMBIOS_RECORD TYPE="9" B64_DATA="CREBCQGvCwMEAQAEAQAABgBNZXp6YW5pbmUgMQAA" />
- <SMBIOS_RECORD TYPE="9" B64_DATA="CRECCQGvCwMEAgAEAQAACQBNZXp6YW5pbmUgMgAA" />
- <SMBIOS_RECORD TYPE="9" B64_DATA="CREDCQGoCgMEAwAE
-1b2
-AQAAAwBNZXp6YW5pbmUgMwAA" />
- <SMBIOS_RECORD TYPE="11" B64_DATA="CwUACwJQU0Y6ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAAUHJvZHVjdCBJRDogNjAzNzE4LUIyMSAgICAgIAAA" />
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIAEQAQ/v9IAEAAAAAJAQEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMSBESU1NIDFEAAA=">
-  <FIELD NAME="Label" VALUE="PROC 1 DIMM 1D"/>
-  <FIELD NAME="Size" VALUE="not installed"/>
- </SMBIOS_RECORD>
- <SMBIO
-0c8
-S_RECORD TYPE="17" B64_DATA="ESIBEQAQ/v9IAEAAABAJAgEAGIAANQUAAAAAAgAAAAA1BVBST0MgMSBESU1NIDJBAAA=">
-  <FIELD NAME="Label" VALUE="PROC 1 DIMM 2A"/>
-  <FIELD NAME="Size" VALUE="4096 MB"/>
-  <FIELD NAME=
-0d3
-"Speed" VALUE="1333 MHz"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESICEQAQ/v9IAEAAAAAJAwEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMSBESU1NIDNFAAA=">
-  <FIELD NAME="Label" VALUE="PROC 1 DIMM 3E"/>
-  <FIELD NAM
-075
-E="Size" VALUE="not installed"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIDEQAQ/v9IAEAAABAJBAEAGIAANQ
-12e
-UAAAAAAgAAAAA1BVBST0MgMSBESU1NIDRCAAA=">
-  <FIELD NAME="Label" VALUE="PROC 1 DIMM 4B"/>
-  <FIELD NAME="Size" VALUE="4096 MB"/>
-  <FIELD NAME="Speed" VALUE="1333 MHz"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIEEQAQ/v9IAEAAAAAJBQEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMSBESU1NIDVGAAA=">
-  <FIELD 
-065
-NAME="Label" VALUE="PROC 1 DIMM 5F"/>
-  <FIELD NAME="Size" VALUE="not installed"/>
- </SMBIOS_RECORD>
-
-1ff
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIFEQAQ/v9IAEAAABAJBgEAGIAANQUAAAAAAgAAAAA1BVBST0MgMSBESU1NIDZDAAA=">
-  <FIELD NAME="Label" VALUE="PROC 1 DIMM 6C"/>
-  <FIELD NAME="Size" VALUE="4096 MB"/>
-  <FIELD NAME="Speed" VALUE="1333 MHz"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIGEQEQ/v9IAEAAAAAJBwEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMiBESU1NIDFEAAA=">
-  <FIELD NAME="Label" VALUE="PROC 2 DIMM 1D"/>
-  <FIELD NAME="Size" VALUE="not installed"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIHEQ
-1ff
-EQ/v9IAEAAABAJCAEAGIAANQUAAAAAAgAAAAA1BVBST0MgMiBESU1NIDJBAAA=">
-  <FIELD NAME="Label" VALUE="PROC 2 DIMM 2A"/>
-  <FIELD NAME="Size" VALUE="4096 MB"/>
-  <FIELD NAME="Speed" VALUE="1333 MHz"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIIEQEQ/v9IAEAAAAAJCQEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMiBESU1NIDNFAAA=">
-  <FIELD NAME="Label" VALUE="PROC 2 DIMM 3E"/>
-  <FIELD NAME="Size" VALUE="not installed"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIJEQEQ/v9IAEAAABAJCgEAGIAANQUAAAAAAgAAAAA1BVBS
-1ff
-T0MgMiBESU1NIDRCAAA=">
-  <FIELD NAME="Label" VALUE="PROC 2 DIMM 4B"/>
-  <FIELD NAME="Size" VALUE="4096 MB"/>
-  <FIELD NAME="Speed" VALUE="1333 MHz"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESIKEQEQ/v9IAEAAAAAJCwEAGIAAAAAAAAAAAAAAAAAAAFBST0MgMiBESU1NIDVGAAA=">
-  <FIELD NAME="Label" VALUE="PROC 2 DIMM 5F"/>
-  <FIELD NAME="Size" VALUE="not installed"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="17" B64_DATA="ESILEQEQ/v9IAEAAABAJDAEAGIAANQUAAAAAAgAAAAA1BVBST0MgMiBESU1NIDZDAAA=">
-  <FIELD NAME="Labe
-1ac
-l" VALUE="PROC 2 DIMM 6C"/>
-  <FIELD NAME="Size" VALUE="4096 MB"/>
-  <FIELD NAME="Speed" VALUE="1333 MHz"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="32" B64_DATA="IAsAIAAAAAAAAAAAAA==" />
- <SMBIOS_RECORD TYPE="38" B64_DATA="JhIAJgEgIP+jDAAAAAAAAAAAAAA=" />
- <SMBIOS_RECORD TYPE="126" B64_DATA="fh8BEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
- <SMBIOS_RECORD TYPE="126" B64_DATA="fh8EEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
-
-1ff
- <SMBIOS_RECORD TYPE="126" B64_DATA="fh8FEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
- <SMBIOS_RECORD TYPE="126" B64_DATA="fh8GEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
- <SMBIOS_RECORD TYPE="126" B64_DATA="fh8HEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
- <SMBIOS_RECORD TYPE="193" B64_DATA="wRwBwQEBAgMEBRMTAAAAAAAAAAAAAAYHCAkKCzA1LzA1LzIwMTEAMDMvMDgvMjAxMAAgICAgICAgIAAgICAgICAgICAgADEuNgBTeXN0ZW0gUHJvZ3JhbW1hYmxlIExvZ2ljIERldmljZQAgACAAIAAgACAAAA==" />
- <SMBIOS_RECORD TYPE="194" B64_DATA="wgUAwgEAAA==" 
-1ff
-/>
- <SMBIOS_RECORD TYPE="195" B64_DATA="wwUAwwEkMEUxMTA3QUYAAA==" />
- <SMBIOS_RECORD TYPE="196" B64_DATA="xAUAxAAAAA==" />
- <SMBIOS_RECORD TYPE="197" B64_DATA="xQwAxQAEIAH/ATwAAAA=" />
- <SMBIOS_RECORD TYPE="197" B64_DATA="xQwGxQYEAAD/AjwAAAA=" />
- <SMBIOS_RECORD TYPE="198" B64_DATA="xgsAxgUAAAAAAAEAAA==" />
- <SMBIOS_RECORD TYPE="199" B64_DATA="xzQAxwwAAAAIIDAQpAYBABYAAAARIBcFpQYBAAYAAAAJICISwQYCABQAAAARIBEDwgYCAAAA" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkAygAR/wEBAAA=" />
- <SMBIOS_RECORD TYPE="202" B64
-1ff
-_DATA="ygkBygER/wIBAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkCygIR/wMBAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkDygMR/wQBAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkEygQR/wUBAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkFygUR/wYBAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkGygYR/wECAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkHygcR/wICAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkIyggR/wMCAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkJygkR/wQCAAA=" />
- <SMBIOS_RECORD TYP
-133
-E="202" B64_DATA="ygkKygoR/wUCAAA=" />
- <SMBIOS_RECORD TYPE="202" B64_DATA="ygkLygsR/wYCAAA=" />
- <SMBIOS_RECORD TYPE="204" B64_DATA="zAsAzAECAwQQAQVwcm9kY2gtMTEwICAgICAgICAgICAgICAgICAgICAgIABwcm9kY2gtMTEwICAgICAgICAgICAgICAgICAgICAgIABCbGFkZVN5c3RlbSBjNzAwMCBFbmNsb3N1cmUgRzIgICAgICAgICAgICAgICAgICAgICAgI
-043
-CAgICAgICAgICAgADEgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgAENaMzEx
-05e
-MUFEMzMgICAAAA=" />
- <SMBIOS_RECORD TYPE="205" B64_DATA="zRYAzQEBRkFUeAAA4P8AAAAAAAANAAAA" />
-
-132
- <SMBIOS_RECORD TYPE="209" B64_DATA="0SQA0QAC5BFb4BRYAQLkEVvgFFwCAuQRW+AUWQMC5BFb4BRdAAA=">
-  <FIELD NAME="Port" VALUE="1"/>
-  <FIELD NAME="MAC" VALUE="E4-11-5B-E0-14-58"/>
-  <FIELD NAME="Port" VALUE="2"/>
-  <FIELD NAME="MAC" VALUE="E4-11-5B-E0-14-5C"/>
-  <FIELD NAME="Port" VALUE="3"/>
-  <FIELD NAME="MAC"
-1ff
- VALUE="E4-11-5B-E0-14-59"/>
-  <FIELD NAME="Port" VALUE="4"/>
-  <FIELD NAME="MAC" VALUE="E4-11-5B-E0-14-5D"/>
-  <FIELD NAME="Port" VALUE="iLO"/>
-  <FIELD NAME="MAC" VALUE="E4-11-5B-D3-EF-C3"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="210" B64_DATA="0gwA0usAAAAAAAAAAAA=" />
- <SMBIOS_RECORD TYPE="211" B64_DATA="0wcA0wAERgAA" />
- <SMBIOS_RECORD TYPE="211" B64_DATA="0wcG0wYERgAA" />
- <SMBIOS_RECORD TYPE="212" B64_DATA="1BgA1CRDUlUAIPn/AAAAAABAAAAAAAAAAAA=" />
- <SMBIOS_RECORD TYPE="215" B64_DATA="1wYA1wAFAAA=" /
-0fb
->
- <SMBIOS_RECORD TYPE="219" B64_DATA="2wgA2/8LAAAAAA==" />
- <SMBIOS_RECORD TYPE="221" B64_DATA="3RQA3QIC5BFb4BRZAwLkEVvgFF0AAA==">
-  <FIELD NAME="Port" VALUE="1"/>
-  <FIELD NAME="MAC" VALUE="E4-11-5B-E0-14-59"/>
-  <FIELD NAME="Port" VALUE="2"/>
-  <FI
-0de
-ELD NAME="MAC" VALUE="E4-11-5B-E0-14-5D"/>
- </SMBIOS_RECORD>
- <SMBIOS_RECORD TYPE="222" B64_DATA="3kYA3gEI8ADxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
- <SMBIOS_RECORD TYPE="2
-140
-23" B64_DATA="3wcA32ZGcAAA" />
- <SMBIOS_RECORD TYPE="224" B64_DATA="4AUA4AAAAA==" />
- <SMBIOS_RECORD TYPE="226" B64_DATA="4hUA4jYwMzcxOENaMzIwNTgwSjMBQ1ozMjA1ODBKMyAgICAgIAAA">
-  <FIELD NAME="Serial Number" VALUE="CZ320580J3      "/>
-  <FIELD NAME="cUUID" VALUE="37333036-3831-5A43-3332-303538304A33"/>
- </SMBIOS_RECORD>
-175
-
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwA4wAEABELogEAAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwB4wAEARELoAEAAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwC4wAEAhELpgEAAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwD4wAEAxELpAEAAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwE4wAEBBELqgEAAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwF4wAEBRELqAEAAAA=" />
-
-1ff
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwG4wYEBhEKogEBAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwH4wYEBxEKoAEBAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwI4wYECBEKpgEBAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwJ4wYECREKpAEBAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwK4wYEChEKqgEBAAA=" />
- <SMBIOS_RECORD TYPE="227" B64_DATA="4wwL4wYECxEKqAEBAAA=" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4A5AAAAAAAAAD/AQAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4B5AEAAAAAAAD/AAAAAA==" />
- <SMBIO
-1f9
-S_RECORD TYPE="228" B64_DATA="5A4C5AIAAAAAAAD/AAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4D5AMAAAAAAAD/AAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4E5AQAAAAAAAD/AAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4F5AUAAAAAAAD/AAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4G5AYAAAAAAAD/AAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4H5AcAAAAAAAD/AAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4I5AgCBAMAAAAAAAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4J5AkCBAMBA
-0ac
-AAAAAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4K5AoCBAMCAAAAAAAAAA==" />
- <SMBIOS_RECORD TYPE="228" B64_DATA="5A4L5AsCBAMDAAAAAAAAAA==" />
- <SMBIOS_RECORD TYPE="22
-05c
-9" B64_DATA="5RQA5SRIREQA4GPzAAAAAAAgAAAAAA==" />
-</GET_HOST_DATA>
-</RIBCL>
-<?xml version="1
-03f
-.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-   
-05f
- MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-  
-03a
-  STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status-97d170e1.request
deleted file mode 100644
index bead327..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 218
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_HOST_POWER_SAVER_STATUS
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status.parsed
deleted file mode 100644
index 3fa8197..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-{'host_power_saver': 'AUTO'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status.raw
deleted file mode 100644
index b9b8427..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_saver_status.raw	
+++ /dev/null
@@ -1,73 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:51 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-075
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<
-073
-?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_HOST_POWER_SAVER
-    HOST_POWER_SAVER="AUTO"
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-00a
-
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status-97d170e1.request
deleted file mode 100644
index 016e658..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 212
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_HOST_POWER_STATUS
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status.parsed
deleted file mode 100644
index 636d83a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'ON'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status.raw
deleted file mode 100644
index bf6474d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_power_status.raw	
+++ /dev/null
@@ -1,71 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:55 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1e2
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_HOST_POWER
-    HOST_POWER="ON"
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No
-019
- error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver-97d170e1.request
deleted file mode 100644
index 21897fd..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 213
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_HOST_PWR_MICRO_VER
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver.parsed
deleted file mode 100644
index a6b7352..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'1.6'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver.raw
deleted file mode 100644
index 2f8c556..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_host_pwr_micro_ver.raw	
+++ /dev/null
@@ -1,71 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:41:59 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_HOST_PWR_MICRO_VER>
-<PWR_MICRO VERSION="1.6"/>
-</GET_HOST_PWR_MICRO_VER>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESS
-020
-AGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config-97d170e1.request
deleted file mode 100644
index 55bb269..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 202
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_HOTKEY_CONFIG
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config.parsed
deleted file mode 100644
index 2b07b3e..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config.parsed	
+++ /dev/null
@@ -1,6 +0,0 @@
-{'ctrl_t': 'NONE,NONE,NONE,NONE,NONE',
- 'ctrl_u': 'NONE,NONE,NONE,NONE,NONE',
- 'ctrl_v': 'NONE,NONE,NONE,NONE,NONE',
- 'ctrl_w': 'NONE,NONE,NONE,NONE,NONE',
- 'ctrl_x': 'NONE,NONE,NONE,NONE,NONE',
- 'ctrl_y': 'NONE,NONE,NONE,NONE,NONE'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config.raw
deleted file mode 100644
index 7aaa5a0..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_hotkey_config.raw	
+++ /dev/null
@@ -1,91 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:03 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-10d
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_HOTKEY_CONFIG>
-    <CTRL_T VALUE="NONE,NONE,NONE,NONE,NONE"/>
-    <CTRL_U VALUE="NONE,NONE,NONE,NONE,NONE"/>
-    <CTRL_V VALUE="NONE,NONE,NONE,NONE,NONE"/>
- 
-0d7
-   <CTRL_W VALUE="NONE,NONE,NONE,NONE,NONE"/>
-    <CTRL_X VALUE="NONE,NONE,NONE,NONE,NONE"/>
-    <CTRL_Y VALUE="NONE,NONE,NONE,NONE,NONE"/>
-</GET_HOTKEY_CONFIG>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23"
-091
->
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x000
-02b
-0"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log-97d170e1.request
deleted file mode 100644
index 13efdce..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 198
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_EVENT_LOG
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log.parsed
deleted file mode 100644
index bd207fe..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log.parsed	
+++ /dev/null
@@ -1,24 +0,0 @@
-[{'class': 'iLO 3',
-  'count': 3,
-  'description': 'XML login: Administrator - xxxxxxxxx(DNS name not found).',
-  'initial_update': '10/08/2015 00:02',
-  'last_update': '10/08/2015 00:02',
-  'severity': 'Informational'},
- {'class': 'iLO 3',
-  'count': 1,
-  'description': 'Event log cleared by: Administrator.',
-  'initial_update': '10/08/2015 00:02',
-  'last_update': '10/08/2015 00:02',
-  'severity': 'Informational'},
- {'class': 'iLO 3',
-  'count': 3,
-  'description': 'XML logout: Administrator - xxxxxxxxx(DNS name not found).',
-  'initial_update': '10/08/2015 00:02',
-  'last_update': '10/08/2015 00:02',
-  'severity': 'Informational'},
- {'class': 'iLO 3',
-  'count': 1,
-  'description': 'XML login: Administrator - xxxxxxxxx(DNS name not found).',
-  'initial_update': '10/08/2015 00:03',
-  'last_update': '10/08/2015 00:03',
-  'severity': 'Informational'}]
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log.raw
deleted file mode 100644
index 6dc55da..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_ilo_event_log.raw	
+++ /dev/null
@@ -1,104 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Thu, 08 Oct 2015 00:03:02 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<EVENT_LOG DESCRIPTION="iLO 3 Event Log">
- <EVENT
-  SEVERITY="Informational"
-  CLASS="iLO 3"
-  LAST_UPDATE="10/08/2015 00:02"
-  INITIAL_UPDATE="10/08/2015 00:02"
-  COUNT="3"
-  DESCRIPTION="XML login: Administrator - xxxxxxxxx(DNS name not found)."
- />
- <EVENT
-  SEVERITY="Informational"
-  CLASS="iLO 3"
-  LAST_UPDATE="10/08/2015 00:02"
-  INITIAL_UPDATE="10/08/2015 00:02"
-  COUNT="1"
-  DESCRIPTION="Event 
-1ff
-log cleared by: Administrator."
- />
- <EVENT
-  SEVERITY="Informational"
-  CLASS="iLO 3"
-  LAST_UPDATE="10/08/2015 00:02"
-  INITIAL_UPDATE="10/08/2015 00:02"
-  COUNT="3"
-  DESCRIPTION="XML logout: Administrator - xxxxxxxxx(DNS name not found)."
- />
- <EVENT
-  SEVERITY="Informational"
-  CLASS="iLO 3"
-  LAST_UPDATE="10/08/2015 00:03"
-  INITIAL_UPDATE="10/08/2015 00:03"
-  COUNT="1"
-  DESCRIPTION="XML login: Administrator - xxxxxxxxx(DNS name not found)."
- />
-</EVENT_LOG>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VE
-0c8
-RSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language-97d170e1.request
deleted file mode 100644
index 4e7306f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 197
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_LANGUAGE
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language.parsed
deleted file mode 100644
index 84205ed..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-{'lang_id': 'en', 'language': 'English'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language.raw
deleted file mode 100644
index f4ad246..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_language.raw	
+++ /dev/null
@@ -1,70 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:17 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_LANGUAGE
-   LANG_ID = "en" 
-   LANGUAGE = "English" 
-   />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-
-085
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings-97d170e1.request
deleted file mode 100644
index 58cf309..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 205
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_NETWORK_SETTINGS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings.parsed
deleted file mode 100644
index ecfcafc..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings.parsed	
+++ /dev/null
@@ -1,63 +0,0 @@
-{'dhcp_dns_server': True,
- 'dhcp_domain_name': True,
- 'dhcp_enable': False,
- 'dhcp_gateway': True,
- 'dhcp_sntp_settings': False,
- 'dhcp_static_route': True,
- 'dhcp_wins_server': True,
- 'dhcpv6_dns_server': True,
- 'dhcpv6_domain_name': True,
- 'dhcpv6_rapid_commit': False,
- 'dhcpv6_sntp_settings': True,
- 'dhcpv6_stateful_enable': True,
- 'dhcpv6_stateless_enable': True,
- 'dns_name': 'xxxxxxxxxxx',
- 'domain_name': 'xxxxxxxxxxxxxxxxxxxx',
- 'enable_nic': True,
- 'full_duplex': 'Automatic',
- 'gateway_ip_address': 'xxxxxxxxxxx',
- 'ip_address': 'xxxxxxxxx',
- 'ipv6_addr_autocfg': True,
- 'ipv6_address': 'fe80::e611:5bff:fed3:efc3',
- 'ipv6_default_gateway': '::',
- 'ipv6_preferred_protocol': True,
- 'ipv6_prim_dns_server': '::',
- 'ipv6_reg_ddns_server': True,
- 'ipv6_sec_dns_server': '::',
- 'ipv6_static_route_1': {'addr_status': 'INACTIVE',
-                         'ipv6_dest': '::',
-                         'ipv6_gateway': '::',
-                         'prefixlen': 0},
- 'ipv6_static_route_2': {'addr_status': 'INACTIVE',
-                         'ipv6_dest': '::',
-                         'ipv6_gateway': '::',
-                         'prefixlen': 0},
- 'ipv6_static_route_3': {'addr_status': 'INACTIVE',
-                         'ipv6_dest': '::',
-                         'ipv6_gateway': '::',
-                         'prefixlen': 0},
- 'ipv6_ter_dns_server': '::',
- 'mac_address': 'e4:11:5b:d3:ef:c3',
- 'nic_speed': 'Automatic',
- 'ping_gateway': True,
- 'prim_dns_server': 'xxxxxxxxxxxxxx',
- 'prim_wins_server': '0.0.0.0',
- 'reg_ddns_server': True,
- 'reg_wins_server': True,
- 'sec_dns_server': '0.0.0.0',
- 'sec_wins_server': '0.0.0.0',
- 'sntp_server1': '',
- 'sntp_server2': '',
- 'speed_autoselect': True,
- 'static_route_1': {'dest': '0.0.0.0',
-                    'gateway': '0.0.0.0',
-                    'mask': '0.0.0.0'},
- 'static_route_2': {'dest': '0.0.0.0',
-                    'gateway': '0.0.0.0',
-                    'mask': '0.0.0.0'},
- 'static_route_3': {'dest': '0.0.0.0',
-                    'gateway': '0.0.0.0',
-                    'mask': '0.0.0.0'},
- 'subnet_mask': '255.255.255.0',
- 'ter_dns_server': '0.0.0.0',
- 'timezone': 'Europe/London'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings.raw
deleted file mode 100644
index f0343e6..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_network_settings.raw	
+++ /dev/null
@@ -1,151 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:21 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-144
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_NETWORK_SETTINGS>
-    <ENABLE_NIC VALUE="Y"/>
-    <SPEED_AUTOSELECT VALUE="Y"/>
-    <NIC_SPEED VALUE="Automatic"/>
-    <FULL_DUPLEX VALUE="Automatic"/>
-    <DHCP_ENABLE VALUE="N"/>
-    <DHCP_GATEWAY VALUE="Y"/>
- 
-1ff
-   <DHCP_DNS_SERVER VALUE="Y"/>
-    <DHCP_WINS_SERVER VALUE="Y"/>
-    <DHCP_STATIC_ROUTE VALUE="Y"/>
-    <DHCP_DOMAIN_NAME VALUE="Y"/>
-    <DHCP_SNTP_SETTINGS VALUE="N"/>
-    <REG_WINS_SERVER VALUE="Y"/>
-    <REG_DDNS_SERVER VALUE="Y"/>
-    <PING_GATEWAY VALUE="Y"/>
-    <MAC_ADDRESS VALUE="e4:11:5b:d3:ef:c3"/>
-    <IP_ADDRESS VALUE="xxxxxxxxx"/>
-    <SUBNET_MASK VALUE="255.255.255.0"/>
-    <GATEWAY_IP_ADDRESS VALUE="xxxxxxxxxxx"/>
-    <DNS_NAME VALUE="xxxxxxxxxxx"/>
-    <DOMAIN_NAME VALUE="xxxxxxxxxxxxxxxx
-1ff
-xxxx"/>
-    <PRIM_DNS_SERVER VALUE="xxxxxxxxxxxxxx"/>
-    <SEC_DNS_SERVER VALUE="0.0.0.0"/>
-    <TER_DNS_SERVER VALUE="0.0.0.0"/>
-    <PRIM_WINS_SERVER VALUE="0.0.0.0"/>
-    <SEC_WINS_SERVER VALUE="0.0.0.0"/>
-    <SNTP_SERVER1 VALUE=""/>
-    <SNTP_SERVER2 VALUE=""/>
-    <TIMEZONE VALUE="Europe/London"/>
-    <STATIC_ROUTE_1 DEST="0.0.0.0"
-                    MASK="0.0.0.0"
-                    GATEWAY="0.0.0.0"/>
-    <STATIC_ROUTE_2 DEST="0.0.0.0"
-                    MASK="0.0.0.0"
-                    GATEWA
-1ff
-Y="0.0.0.0"/>
-    <STATIC_ROUTE_3 DEST="0.0.0.0"
-                    MASK="0.0.0.0"
-                    GATEWAY="0.0.0.0"/>
-    <IPV6_ADDRESS   VALUE="fe80::e611:5bff:fed3:efc3"
-                    PREFIXLEN="64"
-                    ADDR_SOURCE="SLAAC"
-                    ADDR_STATUS="ACTIVE"/>
-    <IPV6_STATIC_ROUTE_1
-                    IPV6_DEST="::"
-                    PREFIXLEN="0"
-                    IPV6_GATEWAY="::"
-                    ADDR_STATUS="INACTIVE"/>
-    <IPV6_STATIC_ROUTE_2
-             
-1ff
-       IPV6_DEST="::"
-                    PREFIXLEN="0"
-                    IPV6_GATEWAY="::"
-                    ADDR_STATUS="INACTIVE"/>
-    <IPV6_STATIC_ROUTE_3
-                    IPV6_DEST="::"
-                    PREFIXLEN="0"
-                    IPV6_GATEWAY="::"
-                    ADDR_STATUS="INACTIVE"/>
-    <IPV6_PRIM_DNS_SERVER VALUE="::"/>
-    <IPV6_SEC_DNS_SERVER VALUE="::"/>
-    <IPV6_TER_DNS_SERVER VALUE="::"/>
-    <IPV6_DEFAULT_GATEWAY VALUE="::"/>
-    <IPV6_PREFERRED_PROTOCOL VALUE="Y"/>
-
-003
-   
-1ff
- <IPV6_ADDR_AUTOCFG VALUE="Y"/>
-    <IPV6_REG_DDNS_SERVER VALUE="Y"/>
-    <DHCPV6_STATELESS_ENABLE VALUE="Y"/>
-    <DHCPV6_STATEFUL_ENABLE VALUE="Y"/>
-    <DHCPV6_RAPID_COMMIT VALUE="N"/>
-    <DHCPV6_DOMAIN_NAME VALUE="Y"/>
-    <DHCPV6_SNTP_SETTINGS VALUE="Y"/>
-    <DHCPV6_DNS_SERVER VALUE="Y"/>
-</GET_NETWORK_SETTINGS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STAT
-034
-US="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info-97d170e1.request
deleted file mode 100644
index 4ecad5a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 212
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<BLADESYSTEM_INFO
- MODE="read"
->
-<GET_OA_INFO
- />
-</BLADESYSTEM_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info.parsed
deleted file mode 100644
index cd3a512..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info.parsed	
+++ /dev/null
@@ -1,7 +0,0 @@
-{'encl': 'xxxxxxxxxx',
- 'ipaddress': 'xxxxxxxxxx',
- 'location': 1,
- 'macaddress': '68:b5:99:bc:f1:63',
- 'rack': 'xxxxxxxxxx',
- 'system_health': 0,
- 'uidstatus': 'Off'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info.raw
deleted file mode 100644
index 2415066..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_oa_info.raw	
+++ /dev/null
@@ -1,75 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:25 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_OA_INFO>
-<ipAddress>xxxxxxxxxx</ipAddress>
-<macAddress>68:b5:99:bc:f1:63</macAddress>
-<RACK>xxxxxxxxxx</RACK>
-<ENCL>xxxxxxxxxx</ENCL>
-<Location>1</Location>
-<System_He
-133
-alth>0</System_Health>
-<uidStatus>Off</uidStatus>
-</GET_OA_INFO>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot-97d170e1.request
deleted file mode 100644
index c78a7f2..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 208
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_ONE_TIME_BOOT
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot.parsed
deleted file mode 100644
index 7c74c59..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'normal'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot.raw
deleted file mode 100644
index a1c83d7..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_one_time_boot.raw	
+++ /dev/null
@@ -1,71 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:28 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0a4
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<R
-044
-ESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<ONE_TIME_BOOT>
-<BOOT_TYPE VALUE="Normal"/>
-</ONE_TIME_BOOT>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
- 
-084
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode-97d170e1.request
deleted file mode 100644
index a2cb588..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 212
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_PENDING_BOOT_MODE
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode.raw
deleted file mode 100644
index 093bdce..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pending_boot_mode.raw	
+++ /dev/null
@@ -1,74 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:34 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0d1
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No e
-017
-rror'
-     />
-</RIBCL>
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-02b
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23
-047
-">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - G
-09a
-ET_PENDING_BOOT_MODE'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled-97d170e1.request
deleted file mode 100644
index ef2e343..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 222
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_PERS_MOUSE_KEYBOARD_ENABLED
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled.parsed
deleted file mode 100644
index 0ca9514..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-True
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled.raw
deleted file mode 100644
index e6041b1..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pers_mouse_keyboard_enabled.raw	
+++ /dev/null
@@ -1,78 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:39 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-036
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONS
-0b2
-E
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_PERS_MOUSE_KEYBOARD_ENABLED>
-    <PERSMOUSE_ENABLED VALUE="Y"/>
-</GET_PERS_MOUSE_KEYBOARD_ENABLED>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-  
-122
-  STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot-97d170e1.request
deleted file mode 100644
index 2314c66..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 210
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_PERSISTENT_BOOT
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot.parsed
deleted file mode 100644
index ed3696b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-['cdrom', 'floppy', 'usb', 'hdd', 'network']
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot.raw
deleted file mode 100644
index 2b10b0b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_persistent_boot.raw	
+++ /dev/null
@@ -1,75 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:45 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<PERSISTENT_BOOT>
-<DEVICE value="CDROM"/>
-<DEVICE value="FLOPPY"/>
-<DEVICE value="USB"/>
-<DEVICE value="HDD"/>
-<DEVICE value="NETWORK"/>
-</PERSISTENT_BOOT>
-</RIBCL>
-<
-073
-?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap-97d170e1.request
deleted file mode 100644
index 667e39d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_POWER_CAP
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap.parsed
deleted file mode 100644
index 765efd4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'OFF'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap.raw
deleted file mode 100644
index 702d2ff..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_cap.raw	
+++ /dev/null
@@ -1,82 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:51 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-14b
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_POWER_CAP>
-<POWER_CAP>"OFF"</POWER_CAP>
-</GET_POWER_CAP>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSIO
-050
-N="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings-97d170e1.request
deleted file mode 100644
index cb76215..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 209
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_POWER_READINGS
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings.parsed
deleted file mode 100644
index 602e03b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings.parsed	
+++ /dev/null
@@ -1,4 +0,0 @@
-{'average_power_reading': (106, 'Watts'),
- 'maximum_power_reading': (157, 'Watts'),
- 'minimum_power_reading': (106, 'Watts'),
- 'present_power_reading': (108, 'Watts')}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings.raw
deleted file mode 100644
index a6edd44..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_power_readings.raw	
+++ /dev/null
@@ -1,74 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:42:56 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_POWER_READINGS>
-<PRESENT_POWER_READING VALUE="108" UNIT="Watts"/>
-<AVERAGE_POWER_READING VALUE="106" UNIT="Watts"/>
-<MAXIMUM_POWER_READING VALUE="157" UNIT="Watts"/>
-0c9
-
-<MINIMUM_POWER_READING VALUE="106" UNIT="Watts"/>
-</GET_POWER_READINGS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name-97d170e1.request
deleted file mode 100644
index f198d7a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 207
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_PRODUCT_NAME
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name.parsed
deleted file mode 100644
index b55b968..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'ProLiant BL460c G7'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name.raw
deleted file mode 100644
index 2aa4e17..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_product_name.raw	
+++ /dev/null
@@ -1,78 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:01 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-  <GET_PRODUCT_NAME>
-    <PRODUCT_NAME VALUE ="ProLiant BL460c G7"/>
-  </GET_PRODUCT_NAME>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0
-0a1
-000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg-97d170e1.request
deleted file mode 100644
index d1ab263..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 200
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_PWREG
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg.parsed
deleted file mode 100644
index d310db3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg.parsed	
+++ /dev/null
@@ -1,4 +0,0 @@
-{'efficiency_mode': 3,
- 'get_host_power': {'host_power': 'ON'},
- 'pcap': {'mode': 'OFF'},
- 'pwralert': {'duration': 0, 'threshold': 0, 'type': 'DISABLED'}}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg.raw
deleted file mode 100644
index 4321216..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_pwreg.raw	
+++ /dev/null
@@ -1,85 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:06 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0c9
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSA
-01f
-GE='No error'
-     />
-</RIBCL>
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_PWREG>
-<PCAP MODE="OFF"></PCAP>
-<EFFICIENCY_MODE>"3"</EFFICIENCY_MODE>
-<PWRALERT TYPE="DISABLED" THRESHOLD="0" DURATION="0"></PWRALERT>
-<GET_HOST_POWER HOST_POWER="ON"/>
-</GET_PWREG>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='N
-01a
-o error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings-97d170e1.request
deleted file mode 100644
index efe1f1b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RACK_INFO
- MODE="read"
->
-<GET_RACK_SETTINGS
- />
-</RACK_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings.raw
deleted file mode 100644
index 268e8b3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_rack_settings.raw	
+++ /dev/null
@@ -1,70 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:11 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0df
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-
-009
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - RACK_INFO'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_RACK_SETTINGS'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not suppor
-021
-ted - RACK_INFO'
-    />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg-97d170e1.request
deleted file mode 100644
index 57a6edf..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 201
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_SECURITY_MSG
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg.parsed
deleted file mode 100644
index eac4df3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-{'security_msg': 'Disabled', 'security_msg_text': ''}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg.raw
deleted file mode 100644
index 2dd17f6..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_security_msg.raw	
+++ /dev/null
@@ -1,89 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:16 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-040
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STAT
-0b7
-US="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_SECURITY_MSG>
-    <
-0ae
-SECURITY_MSG VALUE="Disabled"/>
-    <SECURITY_MSG_TEXT>
-      <![CDATA[]]>
-    </SECURITY_MSG_TEXT>
-</GET_SECURITY_MSG>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23"
-031
->
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No e
-08b
-rror'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr-97d170e1.request
deleted file mode 100644
index 26a47f4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 210
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_SERVER_AUTO_PWR
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr.parsed
deleted file mode 100644
index 636d83a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'ON'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr.raw
deleted file mode 100644
index 63f0122..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_auto_pwr.raw	
+++ /dev/null
@@ -1,73 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:20 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_SERVER_AUTO_PWR>
-<!--
-    Automatically Power On Server is enabled to power-on.
-    Power On Delay is minimum.
--->
-<SERVER_AUTO_PWR VALUE="ON" />
-</GET_SERVER_AUT
-0f9
-O_PWR>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log-97d170e1.request
deleted file mode 100644
index 2fb1f08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_EVENT_LOG
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log.parsed
deleted file mode 100644
index b51c20a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log.parsed	
+++ /dev/null
@@ -1,30 +0,0 @@
-[{'class': 'Maintenance',
-  'count': 1,
-  'description': 'Maintenance note: IML cleared through hpasmcli',
-  'initial_update': '01/27/2012 00:24',
-  'last_update': '08/11/2011 22:01',
-  'severity': 'Repaired'},
- {'class': 'POST Message',
-  'count': 1,
-  'description': 'POST Error: 1785-Drive Array not Configured',
-  'initial_update': '05/05/2011 00:04',
-  'last_update': '05/05/2011 00:04',
-  'severity': 'Caution'},
- {'class': 'Rack Infrastructure',
-  'count': 1,
-  'description': ' LAN Settings Changed (Enclosure Serial Number CZ3130NLTP)',
-  'initial_update': '05/06/2011 22:41',
-  'last_update': '05/06/2011 22:41',
-  'severity': 'Informational'},
- {'class': 'Rack Infrastructure',
-  'count': 1,
-  'description': ' Name Changed (Enclosure Serial Number CZ3130NLTP)',
-  'initial_update': '06/01/2011 19:58',
-  'last_update': '06/01/2011 19:58',
-  'severity': 'Informational'},
- {'class': 'Rack Infrastructure',
-  'count': 1,
-  'description': ' Rack Name Changed (Enclosure Serial Number CZ3130NLTP)',
-  'initial_update': '06/01/2011 19:58',
-  'last_update': '06/01/2011 19:58',
-  'severity': 'Informational'}]
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log.raw
deleted file mode 100644
index 72cb75d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_event_log.raw	
+++ /dev/null
@@ -1,112 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Thu, 08 Oct 2015 00:03:05 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<EVENT_LOG DESCRIPTION="Integrated Management Log">
- <EVENT
-  SEVERITY="Repaired"
-  CLASS="Maintenance"
-  LAST_UPDATE="08/11/2011 22:01"
-  INITIAL_UPDATE="01/27/2012 00:24"
-  COUNT="1"
-  DESCRIPTION="Maintenance note: IML cleared through hpasmcli"
- />
- <EVENT
-  SEVERITY="Caution"
-  CLASS="POST Message"
-  LAST_UPDATE="05/05/2011 00:04"
-  INITIAL_UPDATE="05/05/2011 00:04"
-  COUNT="1"
-  DESCRIPTION="POST 
-1ff
-Error: 1785-Drive Array not Configured"
- />
- <EVENT
-  SEVERITY="Informational"
-  CLASS="Rack Infrastructure"
-  LAST_UPDATE="05/06/2011 22:41"
-  INITIAL_UPDATE="05/06/2011 22:41"
-  COUNT="1"
-  DESCRIPTION=" LAN Settings Changed (Enclosure Serial Number CZ3130NLTP)"
- />
- <EVENT
-  SEVERITY="Informational"
-  CLASS="Rack Infrastructure"
-  LAST_UPDATE="06/01/2011 19:58"
-  INITIAL_UPDATE="06/01/2011 19:58"
-  COUNT="1"
-  DESCRIPTION=" Name Changed (Enclosure Serial Number CZ3130NLTP)"
- />
- <EVENT
-  SEVERITY="Infor
-1c3
-mational"
-  CLASS="Rack Infrastructure"
-  LAST_UPDATE="06/01/2011 19:58"
-  INITIAL_UPDATE="06/01/2011 19:58"
-  COUNT="1"
-  DESCRIPTION=" Rack Name Changed (Enclosure Serial Number CZ3130NLTP)"
- />
-</EVENT_LOG>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn-97d170e1.request
deleted file mode 100644
index ce886b3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 206
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_SERVER_FQDN
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn.raw
deleted file mode 100644
index 0b6bbe4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_fqdn.raw	
+++ /dev/null
@@ -1,66 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:27 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_SERVER_FQDN'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.
-063
-0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name-97d170e1.request
deleted file mode 100644
index 007d873..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 206
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_SERVER_NAME
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name.parsed
deleted file mode 100644
index 671a2a5..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name.raw
deleted file mode 100644
index c272137..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_name.raw	
+++ /dev/null
@@ -1,67 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:30 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<SERVER_NAME VALUE="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     /
-07f
->
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time-97d170e1.request
deleted file mode 100644
index 4507017..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 215
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_SERVER_POWER_ON_TIME
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time.parsed
deleted file mode 100644
index 405b2e6..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-1603014
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time.raw
deleted file mode 100644
index 8b33840..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_server_power_on_time.raw	
+++ /dev/null
@@ -1,69 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:33 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-055
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSA
-093
-GE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1fc
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<SERVER_POWER_ON_MINUTES VALUE="1603014" />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn-97d170e1.request
deleted file mode 100644
index 4a65194..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 203
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_SMH_FQDN
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn.raw
deleted file mode 100644
index 1b7a791..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_smh_fqdn.raw	
+++ /dev/null
@@ -1,66 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:37 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_SMH_FQDN'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?
-060
->
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings-97d170e1.request
deleted file mode 100644
index b22820b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 205
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_SNMP_IM_SETTINGS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings.parsed
deleted file mode 100644
index 48bc71d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings.parsed	
+++ /dev/null
@@ -1,8 +0,0 @@
-{'cim_security_mask': 3,
- 'os_traps': True,
- 'rib_traps': True,
- 'snmp_address_1': '',
- 'snmp_address_2': '',
- 'snmp_address_3': '',
- 'snmp_passthrough_status': True,
- 'web_agent_ip_address': 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings.raw
deleted file mode 100644
index f829218..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_snmp_im_settings.raw	
+++ /dev/null
@@ -1,87 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:40 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0ba
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x
-02e
-0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_SNMP_IM_SETTINGS>
-    <SNMP_ADDRESS_1 VALUE=""/>
-    <SNMP_ADDRESS_2 VALUE=""/>
-    <SNMP_ADDRESS_3 VALUE=""/>
-    <RIB_TRAPS VALUE="Y"/>
-    <OS_TRAPS VALUE="Y"/>
-   
-1ff
- <SNMP_PASSTHROUGH_STATUS VALUE="Y"/>
-    <WEB_AGENT_IP_ADDRESS VALUE="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"/>
-    <CIM_SECURITY_MASK VALUE="3"/>
-</GET_SNMP_IM_SETTINGS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-   
-00e
-  />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial-97d170e1.request
deleted file mode 100644
index d43d2fd..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 202
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_SPATIAL
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial.raw
deleted file mode 100644
index ed96edb..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_spatial.raw	
+++ /dev/null
@@ -1,66 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:43 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ea
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_SPATIAL'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings-97d170e1.request
deleted file mode 100644
index eab7460..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 201
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SSO_INFO
- MODE="read"
->
-<GET_SSO_SETTINGS
- />
-</SSO_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings.parsed
deleted file mode 100644
index 7dc4465..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings.parsed	
+++ /dev/null
@@ -1,19 +0,0 @@
-{'administrator_role': {'admin_priv': True,
-                        'cfg_ilo_priv': True,
-                        'login_priv': True,
-                        'remote_cons_priv': True,
-                        'reset_server_priv': True,
-                        'virtual_media_priv': True},
- 'operator_role': {'admin_priv': False,
-                   'cfg_ilo_priv': False,
-                   'login_priv': True,
-                   'remote_cons_priv': True,
-                   'reset_server_priv': True,
-                   'virtual_media_priv': True},
- 'trust_mode': 'DISABLED',
- 'user_role': {'admin_priv': False,
-               'cfg_ilo_priv': False,
-               'login_priv': True,
-               'remote_cons_priv': False,
-               'reset_server_priv': False,
-               'virtual_media_priv': False}}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings.raw
deleted file mode 100644
index 07c591b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_sso_settings.raw	
+++ /dev/null
@@ -1,91 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:47 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_SSO_SETTINGS>
-<TRUST_MODE VALUE="DISABLED" />
-<USER_ROLE LOGIN_PRIV="Y" />
-<USER_ROLE REMOTE_CONS_PRIV="N" />
-<USER_ROLE VIRTUAL_MEDIA_PRIV="N" />
-<USER_ROLE RESET
-1ff
-_SERVER_PRIV="N" />
-<USER_ROLE CFG_ILO_PRIV="N" />
-<USER_ROLE ADMIN_PRIV="N" />
-<OPERATOR_ROLE LOGIN_PRIV="Y" />
-<OPERATOR_ROLE REMOTE_CONS_PRIV="Y" />
-<OPERATOR_ROLE VIRTUAL_MEDIA_PRIV="Y" />
-<OPERATOR_ROLE RESET_SERVER_PRIV="Y" />
-<OPERATOR_ROLE CFG_ILO_PRIV="N" />
-<OPERATOR_ROLE ADMIN_PRIV="N" />
-<ADMINISTRATOR_ROLE LOGIN_PRIV="Y" />
-<ADMINISTRATOR_ROLE REMOTE_CONS_PRIV="Y" />
-<ADMINISTRATOR_ROLE VIRTUAL_MEDIA_PRIV="Y" />
-<ADMINISTRATOR_ROLE RESET_SERVER_PRIV="Y" />
-<ADMINISTRATOR_ROLE CFG_
-13e
-ILO_PRIV="Y" />
-<ADMINISTRATOR_ROLE ADMIN_PRIV="Y" />
-</GET_SSO_SETTINGS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode-97d170e1.request
deleted file mode 100644
index c6abb82..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 214
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_SUPPORTED_BOOT_MODE
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode.raw
deleted file mode 100644
index faee33f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_supported_boot_mode.raw	
+++ /dev/null
@@ -1,68 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:50 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-097
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSI
-051
-ON="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ff
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_SUPPORTED_BOOT_MODE'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml ver
-06b
-sion="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status-97d170e1.request
deleted file mode 100644
index beace8b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 205
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_TPM_STATUS
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status.parsed
deleted file mode 100644
index e694486..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-{'tpm_enabled': 'No', 'tpm_present': 'No', 'tpm_supported': 'Yes'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status.raw
deleted file mode 100644
index e240e2b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_tpm_status.raw	
+++ /dev/null
@@ -1,90 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:43:56 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0ab
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-03d
-
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0d0
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No 
-018
-error'
-     />
-</RIBCL>
-
-088
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_TPM_STATUS>
-    <TPM_SUP
-041
-PORTED VALUE="Yes"/>
-    <TPM_PRESENT VALUE="No"/>
-    <TPM_ENABL
-0b9
-ED VALUE="No"/>
-</GET_TPM_STATUS>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<R
-05b
-IBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings-97d170e1.request
deleted file mode 100644
index 2cc6db9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 207
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_TWOFACTOR_SETTINGS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings.raw
deleted file mode 100644
index f668cbf..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_twofactor_settings.raw	
+++ /dev/null
@@ -1,68 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:44:01 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1f5
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - GET_TWOFACTOR_SETTINGS'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status-97d170e1.request
deleted file mode 100644
index 441dee2..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 205
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="read"
->
-<GET_UID_STATUS
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status.parsed
deleted file mode 100644
index 765efd4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status.parsed	
+++ /dev/null
@@ -1 +0,0 @@
-'OFF'
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status.raw
deleted file mode 100644
index 3844d2a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_uid_status.raw	
+++ /dev/null
@@ -1,69 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:44:07 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-035
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPON
-0b3
-SE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-1ec
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_UID_STATUS UID="OFF"/>
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user-e4b38d03.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user-e4b38d03.args
deleted file mode 100644
index 29c5645..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user-e4b38d03.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestUser']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user-e4b38d03.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user-e4b38d03.request
deleted file mode 100644
index 51a1305..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user-e4b38d03.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 219
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<USER_INFO
- MODE="read"
->
-<GET_USER
- USER_LOGIN="TestUser"
- />
-</USER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user.parsed
deleted file mode 100644
index 60f3830..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user.parsed	
+++ /dev/null
@@ -1,7 +0,0 @@
-{'admin_priv': True,
- 'config_ilo_priv': True,
- 'remote_cons_priv': True,
- 'reset_server_priv': True,
- 'user_login': 'Administrator',
- 'user_name': 'Administrator',
- 'virtual_media_priv': True}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user.raw
deleted file mode 100644
index 60c8bf5..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_user.raw	
+++ /dev/null
@@ -1,83 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:44:12 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-01d
-<?xml version="1.0"?>
-<RIBCL
-0cb
- VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-12a
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_USER
-    USER_NAME="Administrator"
-    USER_LOGIN="Administrator"
-    ADMIN_PRIV="Y"
-    REMOTE_CONS_PRIV="Y"
-    RESET_SERVER_PRIV="Y"
-    VIRTUAL_MEDIA_PRIV="Y"
-    CONFIG_ILO_PRIV="Y"
-06f
-
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No er
-016
-ror'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status-97d170e1.request
deleted file mode 100644
index f9ab18f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status-97d170e1.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 215
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<GET_VM_STATUS
- DEVICE="CDROM"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status.parsed
deleted file mode 100644
index abdfa07..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status.parsed	
+++ /dev/null
@@ -1,6 +0,0 @@
-{'boot_option': 'NO_BOOT',
- 'device': 'CDROM',
- 'image_inserted': 'NO',
- 'image_url': '',
- 'vm_applet': 'DISCONNECTED',
- 'write_protect': 'NO'}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status.raw
deleted file mode 100644
index a96901f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/get_vm_status.raw	
+++ /dev/null
@@ -1,82 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:44:17 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-01d
-<?xml version="1.0"?>
-<RIBCL
-0ad
- VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAG
-01e
-E='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-16f
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-<GET_VM_STATUS
-    VM_APPLET="DISCONNECTED"
-    DEVICE="CDROM"
-    BOOT_OPTION="NO_BOOT"
-    WRITE_PROTECT="NO"
-    IMAGE_INSERTED="NO"
-    IMAG
-08d
-E_URL=""
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hold_pwr_btn-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hold_pwr_btn-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hold_pwr_btn-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hold_pwr_btn-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hold_pwr_btn-97d170e1.request
deleted file mode 100644
index 51f200d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hold_pwr_btn-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<HOLD_PWR_BTN
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hotkey_config-b78d9061.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hotkey_config-b78d9061.args
deleted file mode 100644
index 821b3de..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hotkey_config-b78d9061.args	
+++ /dev/null
@@ -1 +0,0 @@
-['something', 'something else']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hotkey_config-b78d9061.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hotkey_config-b78d9061.request
deleted file mode 100644
index b3b19fb..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/hotkey_config-b78d9061.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 288
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<HOTKEY_CONFIG
->
-<CTRL_T
- VALUE="something"
- />
-<CTRL_U
- VALUE="something else"
- />
-</HOTKEY_CONFIG>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_certificate-b487ce70.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_certificate-b487ce70.args
deleted file mode 100644
index 3065dfc..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_certificate-b487ce70.args	
+++ /dev/null
@@ -1 +0,0 @@
-['-----BEGIN CERTIFICATE-----\nMIIEJjCCAw6gAwIBAgIBADANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJOTDES\n-----END CERTIFICATE-----']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_certificate-b487ce70.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_certificate-b487ce70.request
deleted file mode 100644
index b571885..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_certificate-b487ce70.request	
+++ /dev/null
@@ -1,25 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 345
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<IMPORT_CERTIFICATE
->
------BEGIN CERTIFICATE-----
-MIIEJjCCAw6gAwIBAgIBADANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJOTDES
------END CERTIFICATE-----
-</IMPORT_CERTIFICATE>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_ssh_key-21d73076.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_ssh_key-21d73076.args
deleted file mode 100644
index d9d70a3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/import_ssh_key-21d73076.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestUser', 'ssh-rsa VGVzdCBrZXk= Test Key']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/insert_virtual_media-78b41622.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/insert_virtual_media-78b41622.args
deleted file mode 100644
index 40ae91d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/insert_virtual_media-78b41622.args	
+++ /dev/null
@@ -1 +0,0 @@
-['CDROM', 'http://localhost/os.iso']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/insert_virtual_media-78b41622.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/insert_virtual_media-78b41622.request
deleted file mode 100644
index d18e186..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/insert_virtual_media-78b41622.request	
+++ /dev/null
@@ -1,23 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 261
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<INSERT_VIRTUAL_MEDIA
- DEVICE="CDROM"
- IMAGE_URL="http://localhost/os.iso"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-5fe55620.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-5fe55620.args
deleted file mode 100644
index f13ab7d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-5fe55620.args	
+++ /dev/null
@@ -1 +0,0 @@
-[True, True, 'ldap.example.com', 389]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-5fe55620.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-5fe55620.request
deleted file mode 100644
index 6392cb8..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-5fe55620.request	
+++ /dev/null
@@ -1,34 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 396
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<DIR_INFO
- MODE="write"
->
-<MOD_DIR_CONFIG
->
-<DIR_AUTHENTICATION_ENABLED
- VALUE="Yes"
- />
-<DIR_SERVER_PORT
- VALUE="389"
- />
-<DIR_LOCAL_USER_ACCT
- VALUE="Yes"
- />
-<DIR_SERVER_ADDRESS
- VALUE="ldap.example.com"
- />
-</MOD_DIR_CONFIG>
-</DIR_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-cd6959df.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-cd6959df.args
deleted file mode 100644
index 0986a13..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-cd6959df.args	
+++ /dev/null
@@ -1 +0,0 @@
-[True, True, '']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-cd6959df.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-cd6959df.request
deleted file mode 100644
index f593219..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_dir_config-cd6959df.request	
+++ /dev/null
@@ -1,31 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 343
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<DIR_INFO
- MODE="write"
->
-<MOD_DIR_CONFIG
->
-<DIR_AUTHENTICATION_ENABLED
- VALUE="Yes"
- />
-<DIR_LOCAL_USER_ACCT
- VALUE="Yes"
- />
-<DIR_SERVER_ADDRESS
- VALUE=""
- />
-</MOD_DIR_CONFIG>
-</DIR_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_federation_group-7fd828d5.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_federation_group-7fd828d5.args
deleted file mode 100644
index 5bfa437..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_federation_group-7fd828d5.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestGroup', None, None, False, False, True]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_federation_group-7fd828d5.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_federation_group-7fd828d5.request
deleted file mode 100644
index 938f817..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_federation_group-7fd828d5.request	
+++ /dev/null
@@ -1,32 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 361
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<MOD_FEDERATION_GROUP
- GROUP_NAME="TestGroup"
->
-<RESET_SERVER_PRIV
- VALUE="Yes"
- />
-<ADMIN_PRIV
- VALUE="No"
- />
-<REMOTE_CONS_PRIV
- VALUE="No"
- />
-</MOD_FEDERATION_GROUP>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-8275a9fd.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-8275a9fd.args
deleted file mode 100644
index 40bdd4a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-8275a9fd.args	
+++ /dev/null
@@ -1,3 +0,0 @@
-{'remote_syslog_enable': True,
- 'remote_syslog_port': 514,
- 'remote_syslog_server_address': '10.1.1.1'}
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-8275a9fd.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-8275a9fd.request
deleted file mode 100644
index 9e719b3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-8275a9fd.request	
+++ /dev/null
@@ -1,31 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 364
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<MOD_GLOBAL_SETTINGS
->
-<REMOTE_SYSLOG_PORT
- VALUE="514"
- />
-<REMOTE_SYSLOG_SERVER_ADDRESS
- VALUE="10.1.1.1"
- />
-<REMOTE_SYSLOG_ENABLE
- VALUE="Yes"
- />
-</MOD_GLOBAL_SETTINGS>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-959ec08c.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-959ec08c.args
deleted file mode 100644
index 6e73acf..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-959ec08c.args	
+++ /dev/null
@@ -1 +0,0 @@
-{'http_port': 80, 'https_port': 443, 'snmp_access_enabled': False}
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-959ec08c.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-959ec08c.request
deleted file mode 100644
index e2381a7..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_global_settings-959ec08c.request	
+++ /dev/null
@@ -1,31 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 329
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<MOD_GLOBAL_SETTINGS
->
-<HTTPS_PORT
- VALUE="443"
- />
-<HTTP_PORT
- VALUE="80"
- />
-<SNMP_ACCESS_ENABLED
- VALUE="No"
- />
-</MOD_GLOBAL_SETTINGS>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-7be5ea0c.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-7be5ea0c.args
deleted file mode 100644
index 0bdda9d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-7be5ea0c.args	
+++ /dev/null
@@ -1,6 +0,0 @@
-{'dhcp_enable': False,
- 'dns_name': 'example-server',
- 'domain_name': 'ilos.example.com',
- 'gateway_ip_address': '10.1.1.254',
- 'ip_address': '10.1.1.1',
- 'subnet_mask': '255.255.255.0'}
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-7be5ea0c.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-7be5ea0c.request
deleted file mode 100644
index 7ebd3c9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-7be5ea0c.request	
+++ /dev/null
@@ -1,40 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 475
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<MOD_NETWORK_SETTINGS
->
-<DOMAIN_NAME
- VALUE="ilos.example.com"
- />
-<GATEWAY_IP_ADDRESS
- VALUE="10.1.1.254"
- />
-<SUBNET_MASK
- VALUE="255.255.255.0"
- />
-<IP_ADDRESS
- VALUE="10.1.1.1"
- />
-<DHCP_ENABLE
- VALUE="No"
- />
-<DNS_NAME
- VALUE="example-server"
- />
-</MOD_NETWORK_SETTINGS>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-d05260aa.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-d05260aa.args
deleted file mode 100644
index f673764..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-d05260aa.args	
+++ /dev/null
@@ -1 +0,0 @@
-{'dhcp_enable': True, 'shared_network_port_vlan_id': 42}
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-d05260aa.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-d05260aa.request
deleted file mode 100644
index e976e3b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_network_settings-d05260aa.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 310
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<MOD_NETWORK_SETTINGS
->
-<SHARED_NETWORK_PORT_VLAN_ID
- VALUE="42"
- />
-<DHCP_ENABLE
- VALUE="Yes"
- />
-</MOD_NETWORK_SETTINGS>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_snmp_im_settings-cda9aa7e.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_snmp_im_settings-cda9aa7e.args
deleted file mode 100644
index 2be520f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_snmp_im_settings-cda9aa7e.args	
+++ /dev/null
@@ -1,5 +0,0 @@
-[True,
- '10.1.1.1',
- '10.1.1.2',
- 'rocomm',
- {'value': 'trapcomm', 'version': '2c'}]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_snmp_im_settings-cda9aa7e.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_snmp_im_settings-cda9aa7e.request
deleted file mode 100644
index 4a514a8..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_snmp_im_settings-cda9aa7e.request	
+++ /dev/null
@@ -1,38 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 471
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<MOD_SNMP_IM_SETTINGS
->
-<SNMP_ADDRESS_1_ROCOMMUNITY
- VALUE="rocomm"
- />
-<WEB_AGENT_IP_ADDRESS
- VALUE="10.1.1.1"
- />
-<SNMP_ADDRESS_1
- VALUE="10.1.1.2"
- />
-<SNMP_ACCESS
- VALUE="Yes"
- />
-<SNMP_ADDRESS_1_TRAPCOMMUNITY
- VALUE="trapcomm"
- VERSION="2c"
- />
-</MOD_SNMP_IM_SETTINGS>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_sso_settings-d5f53aa5.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_sso_settings-d5f53aa5.args
deleted file mode 100644
index e9368b3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_sso_settings-d5f53aa5.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TrustMode', True, False, True]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_sso_settings-d5f53aa5.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_sso_settings-d5f53aa5.request
deleted file mode 100644
index e6ce6c1..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_sso_settings-d5f53aa5.request	
+++ /dev/null
@@ -1,31 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 345
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SSO_INFO
- MODE="write"
->
-<MOD_SSO_SETTINGS
->
-<TRUST_MODE
- VALUE="TrustMode"
- />
-<USER_ROLE
- REMOTE_CONS_PRIV="Yes"
- />
-<USER_ROLE
- VIRTUAL_MEDIA_PRIV="Yes"
- />
-</MOD_SSO_SETTINGS>
-</SSO_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_user-3137938b.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_user-3137938b.args
deleted file mode 100644
index 6f74dd5..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_user-3137938b.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestUser', 'TestUser2', 'TestPassword2', False, True]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_user-3137938b.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_user-3137938b.request
deleted file mode 100644
index 9b2466d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/mod_user-3137938b.request	
+++ /dev/null
@@ -1,35 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 377
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<USER_INFO
- MODE="write"
->
-<MOD_USER
- USER_LOGIN="TestUser"
->
-<USER_NAME
- VALUE="TestUser2"
- />
-<PASSWORD
- VALUE="TestPassword2"
- />
-<ADMIN_PRIV
- VALUE="No"
- />
-<REMOTE_CONS_PRIV
- VALUE="Yes"
- />
-</MOD_USER>
-</USER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/press_pwr_btn-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/press_pwr_btn-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/press_pwr_btn-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/press_pwr_btn-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/press_pwr_btn-97d170e1.request
deleted file mode 100644
index dab896c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/press_pwr_btn-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 205
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<PRESS_PWR_BTN
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply-ad6a1b0a.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply-ad6a1b0a.args
deleted file mode 100644
index 404128f..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply-ad6a1b0a.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestProfile', 'Action']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply-ad6a1b0a.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply-ad6a1b0a.request
deleted file mode 100644
index 202ccde..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply-ad6a1b0a.request	
+++ /dev/null
@@ -1,31 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 339
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<PROFILE_APPLY
->
-<PROFILE_DESC_NAME
- VALUE="TestProfile"
- />
-<PROFILE_OPTIONS
- VALUE="none"
- />
-<PROFILE_ACTION
- VALUE="Action"
- />
-</PROFILE_APPLY>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results-97d170e1.request
deleted file mode 100644
index 5c4d462..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 210
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<PROFILE_APPLY_GET_RESULTS
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results.raw
deleted file mode 100644
index 44b4dcc..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_apply_get_results.raw	
+++ /dev/null
@@ -1,72 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:44:23 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-107
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - PROFILE_APPLY_GET_RESULTS'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-
-009
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_delete-c92870ce.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_delete-c92870ce.args
deleted file mode 100644
index 0328917..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_delete-c92870ce.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestProfile']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_delete-c92870ce.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_delete-c92870ce.request
deleted file mode 100644
index d474310..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_delete-c92870ce.request	
+++ /dev/null
@@ -1,25 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 264
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<PROFILE_DELETE
->
-<PROFILE_DESC_NAME
- VALUE="TestProfile"
- />
-</PROFILE_DELETE>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_desc_download-ae1dcf18.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_desc_download-ae1dcf18.args
deleted file mode 100644
index 885ffb2..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_desc_download-ae1dcf18.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestProfileDesc', 'TestProfile', 'Description']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_desc_download-ae1dcf18.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_desc_download-ae1dcf18.request
deleted file mode 100644
index fb442e4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_desc_download-ae1dcf18.request	
+++ /dev/null
@@ -1,34 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 435
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<PROFILE_DESC_DOWNLOAD
->
-<PROFILE_DESC_NAME
- VALUE="TestProfileDesc"
- />
-<PROFILE_NAME
- VALUE="TestProfile"
- />
-<PROFILE_DESCRIPTION
- VALUE="Description"
- />
-<PROFILE_SCHEMA
- VALUE="intelligentprovisioning.1.0.0"
- />
-</PROFILE_DESC_DOWNLOAD>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list-97d170e1.request
deleted file mode 100644
index 748ef18..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 197
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="read"
->
-<PROFILE_LIST
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list.raw
deleted file mode 100644
index b65aced..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/profile_list.raw	
+++ /dev/null
@@ -1,68 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: text/xml
-Date: Wed, 07 Oct 2015 23:44:28 GMT
-Cache-Control: no-cache
-Expires: Thu, 26 Oct 1995 00:00:00 GMT
-Transfer-Encoding: chunked
-Server: Allegro-Software-RomPager/4.62
-Connection: close
-
-0e8
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-177
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x003C"
-    MESSAGE='Feature not supported - PROFILE_LIST'
-    />
-</RIBCL>
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-074
-<?xml version="1.0"?>
-<RIBCL VERSION="2.23">
-<RESPONSE
-    STATUS="0x0000"
-    MESSAGE='No error'
-     />
-</RIBCL>
-
-0
-
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_rib-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_rib-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_rib-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_rib-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_rib-97d170e1.request
deleted file mode 100644
index 271ced5..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_rib-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 195
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<RESET_RIB
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_server-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_server-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_server-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_server-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_server-97d170e1.request
deleted file mode 100644
index f1cb9aa..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/reset_server-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 204
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<RESET_SERVER
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ahs_status-89a06bbb.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ahs_status-89a06bbb.args
deleted file mode 100644
index 7cd8846..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ahs_status-89a06bbb.args	
+++ /dev/null
@@ -1 +0,0 @@
-[True]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ahs_status-89a06bbb.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ahs_status-89a06bbb.request
deleted file mode 100644
index f5d9a69..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ahs_status-89a06bbb.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 217
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_AHS_STATUS
- VALUE="enable"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-1b9316da.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-1b9316da.args
deleted file mode 100644
index ad88b14..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-1b9316da.args	
+++ /dev/null
@@ -1 +0,0 @@
-'N'
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-1b9316da.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-1b9316da.request
deleted file mode 100644
index e0ef6c9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-1b9316da.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 217
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_ASSET_TAG
- VALUE="N"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-45149d27.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-45149d27.args
deleted file mode 100644
index c10ddb9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-45149d27.args	
+++ /dev/null
@@ -1 +0,0 @@
-'L'
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-45149d27.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-45149d27.request
deleted file mode 100644
index 2e321c5..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-45149d27.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 217
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_ASSET_TAG
- VALUE="L"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-69a57c4b.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-69a57c4b.args
deleted file mode 100644
index bf6a07a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-69a57c4b.args	
+++ /dev/null
@@ -1 +0,0 @@
-'0'
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-69a57c4b.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-69a57c4b.request
deleted file mode 100644
index 19a3bec..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-69a57c4b.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 217
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_ASSET_TAG
- VALUE="0"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-e521e544.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-e521e544.args
deleted file mode 100644
index 2002a52..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-e521e544.args	
+++ /dev/null
@@ -1 +0,0 @@
-'1'
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-e521e544.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-e521e544.request
deleted file mode 100644
index e0eaad7..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_asset_tag-e521e544.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 217
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_ASSET_TAG
- VALUE="1"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_direct_connect-1e661dd8.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_direct_connect-1e661dd8.args
deleted file mode 100644
index 7d72199..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_direct_connect-1e661dd8.args	
+++ /dev/null
@@ -1 +0,0 @@
-['ErsUser', 'ErsPassword', 'ErsProxyHost', 3128]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_direct_connect-1e661dd8.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_direct_connect-1e661dd8.request
deleted file mode 100644
index f7c778b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_direct_connect-1e661dd8.request	
+++ /dev/null
@@ -1,34 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 410
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_ERS_DIRECT_CONNECT
->
-<ERS_HPP_USER_ID
- VALUE="ErsUser"
- />
-<ERS_HPP_PASSWORD
- VALUE="ErsPassword"
- />
-<ERS_WEB_proxy_host
- VALUE="ErsProxyHost"
- />
-<ERS_WEB_proxy_port
- VALUE="3128"
- />
-</SET_ERS_DIRECT_CONNECT>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_irs_connect-c1868f1c.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_irs_connect-c1868f1c.args
deleted file mode 100644
index c28b6d8..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_irs_connect-c1868f1c.args	
+++ /dev/null
@@ -1 +0,0 @@
-['ErsUrl', 9999]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_irs_connect-c1868f1c.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_irs_connect-c1868f1c.request
deleted file mode 100644
index db5e87c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_irs_connect-c1868f1c.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 314
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_ERS_IRS_CONNECT
->
-<ERS_DESTINATION_URL
- VALUE="ErsUrl"
- />
-<ERS_DESTINATION_PORT
- VALUE="9999"
- />
-</SET_ERS_IRS_CONNECT>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_web_proxy-19ea4c7b.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_web_proxy-19ea4c7b.args
deleted file mode 100644
index 5a5b3c1..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_web_proxy-19ea4c7b.args	
+++ /dev/null
@@ -1 +0,0 @@
-['ErsProxy', 3128]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_web_proxy-19ea4c7b.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_web_proxy-19ea4c7b.request
deleted file mode 100644
index 78c5031..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_ers_web_proxy-19ea4c7b.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 309
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_ERS_WEB_PROXY
->
-<ERS_WEB_proxy_host
- VALUE="ErsProxy"
- />
-<ERS_WEB_proxy_port
- VALUE="3128"
- />
-</SET_ERS_WEB_PROXY>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_federation_multicast-b250fbe5.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_federation_multicast-b250fbe5.args
deleted file mode 100644
index 8af95df..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_federation_multicast-b250fbe5.args	
+++ /dev/null
@@ -1 +0,0 @@
-[False]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_federation_multicast-b250fbe5.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_federation_multicast-b250fbe5.request
deleted file mode 100644
index f059ecd..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_federation_multicast-b250fbe5.request	
+++ /dev/null
@@ -1,34 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 414
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_FEDERATION_MULTICAST
->
-<MULTICAST_DISCOVERY_ENABLED
- VALUE="No"
- />
-<MULTICAST_ANNOUNCEMENT_INTERVAL
- VALUE="600"
- />
-<IPV6_MULTICAST_SCOPE
- VALUE="Site"
- />
-<MULTICAST_TTL
- VALUE="5"
- />
-</SET_FEDERATION_MULTICAST>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power-b250fbe5.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power-b250fbe5.args
deleted file mode 100644
index 8af95df..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power-b250fbe5.args	
+++ /dev/null
@@ -1 +0,0 @@
-[False]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power-b250fbe5.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power-b250fbe5.request
deleted file mode 100644
index 252ce14..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power-b250fbe5.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 224
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_HOST_POWER
- HOST_POWER="No"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power_saver-b2c1f01d.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power_saver-b2c1f01d.args
deleted file mode 100644
index 0e0f75e..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power_saver-b2c1f01d.args	
+++ /dev/null
@@ -1 +0,0 @@
-['PowerSaver']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power_saver-b2c1f01d.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power_saver-b2c1f01d.request
deleted file mode 100644
index d33df4c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_host_power_saver-b2c1f01d.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 244
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_HOST_POWER_SAVER
- HOST_POWER_SAVER="PowerSaver"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_language-a078dcd9.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_language-a078dcd9.args
deleted file mode 100644
index 45f9bfb..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_language-a078dcd9.args	
+++ /dev/null
@@ -1 +0,0 @@
-['en']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_language-a078dcd9.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_language-a078dcd9.request
deleted file mode 100644
index 214e4ee..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_language-a078dcd9.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 213
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_LANGUAGE
- LANG_ID="en"
- />
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-029cf8f1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-029cf8f1.args
deleted file mode 100644
index 1972c12..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-029cf8f1.args	
+++ /dev/null
@@ -1 +0,0 @@
-['BootDevice']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-029cf8f1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-029cf8f1.request
deleted file mode 100644
index 2d85822..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-029cf8f1.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 230
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_ONE_TIME_BOOT
- VALUE="BootDevice"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-4618ce34.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-4618ce34.args
deleted file mode 100644
index dacf247..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-4618ce34.args	
+++ /dev/null
@@ -1 +0,0 @@
-['floppy']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-4618ce34.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-4618ce34.request
deleted file mode 100644
index 02c00b1..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_one_time_boot-4618ce34.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 226
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_ONE_TIME_BOOT
- VALUE="FLOPPY"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pending_boot_mode-925b8571.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pending_boot_mode-925b8571.args
deleted file mode 100644
index 5e4fa33..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pending_boot_mode-925b8571.args	
+++ /dev/null
@@ -1 +0,0 @@
-['UEFI']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pending_boot_mode-925b8571.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pending_boot_mode-925b8571.request
deleted file mode 100644
index f5b7f20..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pending_boot_mode-925b8571.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 228
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_PENDING_BOOT_MODE
- VALUE="UEFI"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pers_mouse_keyboard_enabled-b250fbe5.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pers_mouse_keyboard_enabled-b250fbe5.args
deleted file mode 100644
index 8af95df..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pers_mouse_keyboard_enabled-b250fbe5.args	
+++ /dev/null
@@ -1 +0,0 @@
-[False]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pers_mouse_keyboard_enabled-b250fbe5.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pers_mouse_keyboard_enabled-b250fbe5.request
deleted file mode 100644
index 4a3899c..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pers_mouse_keyboard_enabled-b250fbe5.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 236
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_PERS_MOUSE_KEYBOARD_ENABLED
- VALUE="No"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_persistent_boot-61fd7c78.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_persistent_boot-61fd7c78.args
deleted file mode 100644
index c99fddc..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_persistent_boot-61fd7c78.args	
+++ /dev/null
@@ -1 +0,0 @@
-['cdrom,floppy,boot_device']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_persistent_boot-61fd7c78.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_persistent_boot-61fd7c78.request
deleted file mode 100644
index 4a1f52a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_persistent_boot-61fd7c78.request	
+++ /dev/null
@@ -1,31 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 330
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_PERSISTENT_BOOT
->
-<DEVICE
- VALUE="CDROM"
- />
-<DEVICE
- VALUE="FLOPPY"
- />
-<DEVICE
- VALUE="boot_device"
- />
-</SET_PERSISTENT_BOOT>
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_power_cap-5131bf00.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_power_cap-5131bf00.args
deleted file mode 100644
index 78f0561..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_power_cap-5131bf00.args	
+++ /dev/null
@@ -1 +0,0 @@
-['CAP']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_power_cap-5131bf00.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_power_cap-5131bf00.request
deleted file mode 100644
index be4d0aa..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_power_cap-5131bf00.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 223
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_POWER_CAP
- POWER_CAP="CAP"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-cb1b2ad7.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-cb1b2ad7.args
deleted file mode 100644
index 47d18fe..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-cb1b2ad7.args	
+++ /dev/null
@@ -1 +0,0 @@
-['disabled']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-cb1b2ad7.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-cb1b2ad7.request
deleted file mode 100644
index 36eb3a2..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-cb1b2ad7.request	
+++ /dev/null
@@ -1,25 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 247
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_PWREG
->
-<PWRALERT
- TYPE="disabled"
- />
-</SET_PWREG>
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-e651c884.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-e651c884.args
deleted file mode 100644
index 654aaa9..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-e651c884.args	
+++ /dev/null
@@ -1 +0,0 @@
-['enabled', 'threshold']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-e651c884.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-e651c884.request
deleted file mode 100644
index 2e25b0b..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_pwreg-e651c884.request	
+++ /dev/null
@@ -1,29 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 313
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SET_PWREG
->
-<PWRALERT
- TYPE="enabled"
- />
-<PWRALERT_SETTINGS
- DURATION="None"
- THRESHOLD="threshold"
- />
-</SET_PWREG>
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_security_msg-83084544.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_security_msg-83084544.args
deleted file mode 100644
index 29c4000..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_security_msg-83084544.args	
+++ /dev/null
@@ -1 +0,0 @@
-[True, 'Security Message Goes Here']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_security_msg-83084544.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_security_msg-83084544.request
deleted file mode 100644
index 6e56315..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_security_msg-83084544.request	
+++ /dev/null
@@ -1,31 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 342
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_SECURITY_MSG
->
-<SECURITY_MSG
- VALUE="Yes"
- />
-<SECURITY_MSG_TEXT
->
-
-<![CDATA[Security Message Goes Here]]>
-
-</SECURITY_MSG_TEXT>
-</SET_SECURITY_MSG>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-02fb8022.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-02fb8022.args
deleted file mode 100644
index c02290d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-02fb8022.args	
+++ /dev/null
@@ -1 +0,0 @@
-[45]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-02fb8022.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-02fb8022.request
deleted file mode 100644
index 7ef7237..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-02fb8022.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 220
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SERVER_AUTO_PWR
- VALUE="45"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-89a06bbb.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-89a06bbb.args
deleted file mode 100644
index 7cd8846..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-89a06bbb.args	
+++ /dev/null
@@ -1 +0,0 @@
-[True]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-89a06bbb.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-89a06bbb.request
deleted file mode 100644
index 1efc2b3..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_auto_pwr-89a06bbb.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 221
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SERVER_AUTO_PWR
- VALUE="Yes"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_fqdn-e8d957f5.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_fqdn-e8d957f5.args
deleted file mode 100644
index 87a0c9a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_fqdn-e8d957f5.args	
+++ /dev/null
@@ -1 +0,0 @@
-['example-server.example.com']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_fqdn-e8d957f5.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_fqdn-e8d957f5.request
deleted file mode 100644
index af2fe65..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_fqdn-e8d957f5.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 240
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SERVER_FQDN
- VALUE="example-server.example.com"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_name-62194c5c.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_name-62194c5c.args
deleted file mode 100644
index cc1deb4..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_name-62194c5c.args	
+++ /dev/null
@@ -1 +0,0 @@
-['example-server']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_name-62194c5c.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_name-62194c5c.request
deleted file mode 100644
index fe5a293..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_server_name-62194c5c.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 228
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<SERVER_NAME
- VALUE="example-server"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vf_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vf_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vf_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vf_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vf_status-97d170e1.request
deleted file mode 100644
index 51aefca..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vf_status-97d170e1.request	
+++ /dev/null
@@ -1,28 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 295
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_VF_STATUS
->
-<VF_BOOT_OPTION
- value="BOOT_ONCE"
- />
-<VF_WRITE_PROTECT
- value="YES"
- />
-</SET_VF_STATUS>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vm_status-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vm_status-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vm_status-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vm_status-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vm_status-97d170e1.request
deleted file mode 100644
index a30997d..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/set_vm_status-97d170e1.request	
+++ /dev/null
@@ -1,29 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 312
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<SET_VM_STATUS
- DEVICE="CDROM"
->
-<VM_BOOT_OPTION
- value="BOOT_ONCE"
- />
-<VM_WRITE_PROTECT
- value="YES"
- />
-</SET_VM_STATUS>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_l2_collection-65c6eff7.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_l2_collection-65c6eff7.args
deleted file mode 100644
index 8e67c32..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_l2_collection-65c6eff7.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestMessage']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_l2_collection-65c6eff7.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_l2_collection-65c6eff7.request
deleted file mode 100644
index 9d57ebb..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_l2_collection-65c6eff7.request	
+++ /dev/null
@@ -1,25 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 271
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<TRIGGER_L2_COLLECTION
->
-<MESSAGE_ID
- value="TestMessage"
- />
-</TRIGGER_L2_COLLECTION>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_test_event-65c6eff7.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_test_event-65c6eff7.args
deleted file mode 100644
index 8e67c32..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_test_event-65c6eff7.args	
+++ /dev/null
@@ -1 +0,0 @@
-['TestMessage']
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_test_event-65c6eff7.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_test_event-65c6eff7.request
deleted file mode 100644
index 6d7e4eb..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/trigger_test_event-65c6eff7.request	
+++ /dev/null
@@ -1,25 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 265
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<RIB_INFO
- MODE="write"
->
-<TRIGGER_TEST_EVENT
->
-<MESSAGE_ID
- value="TestMessage"
- />
-</TRIGGER_TEST_EVENT>
-</RIB_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/uid_control-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/uid_control-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/uid_control-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/uid_control-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/uid_control-97d170e1.request
deleted file mode 100644
index 80d2529..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/uid_control-97d170e1.request	
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 214
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<UID_CONTROL
- UID="No"
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/warm_boot_server-97d170e1.args b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/warm_boot_server-97d170e1.args
deleted file mode 100644
index 0637a08..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/warm_boot_server-97d170e1.args	
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/warm_boot_server-97d170e1.request b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/warm_boot_server-97d170e1.request
deleted file mode 100644
index bf9fc5a..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/warm_boot_server-97d170e1.request	
+++ /dev/null
@@ -1,21 +0,0 @@
-POST /ribcl HTTP/1.1
-Host: localhost
-Content-Length: 208
-Connection: Close
-
-<?xml version="1.0"?>
-<RIBCL
- VERSION="2.0"
->
-<LOGIN
- PASSWORD="TestPassword"
- USER_LOGIN="Administrator"
->
-<SERVER_INFO
- MODE="write"
->
-<WARM_BOOT_SERVER
- />
-</SERVER_INFO>
-</LOGIN>
-</RIBCL>
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/xmldata.parsed b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/xmldata.parsed
deleted file mode 100644
index 0a71adc..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/xmldata.parsed	
+++ /dev/null
@@ -1,23 +0,0 @@
-{'bladesystem': {'bay': 1,
-                 'manager': {'encl': 'xxxxxxxxxx',
-                             'mgmtipaddr': 'xxxxxxxxxx',
-                             'rack': 'xxxxxxxxxx',
-                             'st': 2,
-                             'type': 'Onboard Administrator'}},
- 'hsi': {'cuuid': '37333036-3831-5A43-3332-303538304A33',
-         'sbsn': 'CZ320580J3',
-         'sp': 1,
-         'spn': 'ProLiant BL460c G7',
-         'uuid': '603718CZ320580J3',
-         'virtual': {'state': 'Inactive',
-                     'vid': [('bsn', {}), ('cuuid', {})]}},
- 'mp': {'bblk': '03/08/2010',
-        'fwri': '1.82',
-        'hwri': 'ASIC: 12',
-        'ipm': 1,
-        'pn': 'Integrated Lights-Out 3 (iLO 3)',
-        'pwrm': '1.6',
-        'sn': 'ILOCZ320580J3',
-        'sso': 0,
-        'st': 1,
-        'uuid': 'ILO603718CZ320580J3'}}
diff --git a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/xmldata.raw b/tests/xml/ProLiant BL460c G7 - iLO3 1.82/xmldata.raw
deleted file mode 100644
index eb84d00..0000000
--- a/tests/xml/ProLiant BL460c G7 - iLO3 1.82/xmldata.raw	
+++ /dev/null
@@ -1,37 +0,0 @@
-<RIMP>
-<HSI>
-<SBSN>CZ320580J3      </SBSN>
-<SPN>ProLiant BL460c G7</SPN>
-<UUID>603718CZ320580J3</UUID>
-<SP>1</SP>
-<cUUID>37333036-3831-5A43-3332-303538304A33</cUUID>
-<VIRTUAL>
-<STATE>Inactive</STATE>
-<VID>
-<BSN></BSN>
-<cUUID></cUUID>
-</VID>
-</VIRTUAL>
-</HSI>
-<MP>
-<ST>1</ST>
-<PN>Integrated Lights-Out 3 (iLO 3)</PN>
-<FWRI>1.82</FWRI>
-<BBLK>03/08/2010</BBLK>
-<HWRI>ASIC: 12</HWRI>
-<SN>ILOCZ320580J3      </SN>
-<UUID>ILO603718CZ320580J3</UUID>
-<IPM>1</IPM>
-<SSO>0</SSO>
-<PWRM>1.6</PWRM>
-</MP>
-<BLADESYSTEM>
-<BAY>1</BAY>
-<MANAGER>
-<TYPE>Onboard Administrator</TYPE>
-<MGMTIPADDR>xxxxxxxxxx</MGMTIPADDR>
-<RACK>xxxxxxxxxx</RACK>
-<ENCL>xxxxxxxxxx</ENCL>
-<ST>2</ST></MANAGER>
-</BLADESYSTEM>
-</RIMP>
diff --git a/tests/xml/fetch_responses b/tests/xml/fetch_responses
deleted file mode 100755
index b3fc119..0000000
--- a/tests/xml/fetch_responses
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/python
-
-import ConfigParser
-import hpilo
-import optparse
-import os
-import pprint
-import sys
-import time
-import types
-
-# Almost all methods that fetch data use the _info_tag function
-methods = [meth for meth in dir(hpilo.Ilo) 
-            if isinstance(getattr(hpilo.Ilo, meth), types.MethodType)
-            and '_info_tag' in getattr(hpilo.Ilo, meth).__code__.co_names]
-# Except xmldata (raw http call) and certificate_signing_request
-methods += ['xmldata', 'certificate_signing_request']
-methods.sort()
-method_args = {
-    'get_user': ['Administrator'],
-    'get_federation_group': ['slartibartfast'],
-}
-
-def main():
-    usage = """
-  %prog [options] hostname"""
-
-    p = optparse.OptionParser(usage=usage, add_help_option=False)
-    p.add_option("-l", "--login", dest="login", default=None,
-                 help="Username to access the iLO")
-    p.add_option("-p", "--password", dest="password", default=None,
-                 help="Password to access the iLO")
-    p.add_option("-i", "--interactive", action="store_true", default=False,
-                 help="Prompt for username and/or password if they are not specified.")
-    p.add_option("-c", "--config", dest="config", default="~/.ilo.conf",
-                 help="File containing authentication and config details", metavar="FILE")
-    p.add_option("-t", "--timeout", dest="timeout", type="int", default=60,
-                 help="Timeout for iLO connections")
-    p.add_option("-P", "--protocol", dest="protocol", choices=("http","raw","local"), default=None,
-                 help="Use the specified protocol instead of autodetecting")
-    p.add_option("-d", "--debug", dest="debug", action="count", default=0,
-                 help="Output debug information, repeat to see all XML data")
-    p.add_option("-o", "--port", dest="port", type="int", default=443,
-                 help="SSL port to connect to")
-
-    opts, args = p.parse_args()
-
-    if len(args) != 1:
-        p.error("No hostname given")
-
-    hostname = args[0]
-
-    config = ConfigParser.ConfigParser()
-    if os.path.exists(os.path.expanduser(opts.config)):
-        config.read(os.path.expanduser(opts.config))
-
-    login = None
-    password = None
-    needs_login = True
-    if hostname == 'localhost':
-        opts.protocol = 'local'
-        needs_login = False
-    if needs_login:
-        if config.has_option('ilo', 'login'):
-            login = config.get('ilo', 'login')
-        if config.has_option('ilo', 'password'):
-            password = config.get('ilo', 'password')
-        if opts.login:
-            login = opts.login
-        if opts.password:
-            password = opts.password
-        if not login or not password:
-            if opts.interactive:
-                while not login:
-                    login = input('Login for iLO at %s: ' % hostname)
-                while not password:
-                    password = getpass.getpass('Password for %s@%s:' % (login, hostname))
-            else:
-                p.error("No login details provided")
-
-    opts.protocol = {
-        'http':  hpilo.ILO_HTTP,
-        'raw':   hpilo.ILO_RAW,
-        'local': hpilo.ILO_LOCAL,
-    }.get(opts.protocol, None)
-
-    ilo = hpilo.Ilo(hostname, login, password, opts.timeout, opts.port, opts.protocol)
-    ilo.debug = opts.debug
-    if config.has_option('ilo', 'hponcfg'):
-        ilo.hponcfg = config.get('ilo', 'hponcfg')
-    fw_version = ilo.get_fw_version()
-    host_data = ilo.get_host_data()
-    product_name = None
-    for data in host_data:
-        if 'Product Name' in data:
-            product_name = data['Product Name']
-            break
-    else:
-        raise RuntimeError("No product name found")
-    output_dir = '%s - %s %s' % (product_name, fw_version['management_processor'], fw_version['firmware_version'])
-    if os.path.exists(output_dir):
-        answer = raw_input("I already have output for %s, rescan? [(y)es/(m)issing only/(N)o] " % output_dir).lower()
-        if answer == 'n':
-            sys.exit(0)
-        missing_only = answer == 'm'
-    else:
-        os.makedirs(output_dir)
-    print("Fetching data for %s" % output_dir)
-    output_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), output_dir)
-    for number, meth in enumerate(methods):
-        sys.stdout.write('\r\033[K%s (%d/%d)' % (meth, number+1, len(methods)))
-        sys.stdout.flush()
-        args = method_args.get(meth, [])
-        output_file_raw = os.path.join(output_dir, meth + '.raw')
-        output_file_parsed = os.path.join(output_dir, meth + '.parsed')
-        if os.path.exists(output_file_raw):
-            if missing_only:
-                continue
-            else:
-                os.unlink(output_file_raw)
-        ilo.save_response = output_file_raw
-        try:
-            data = getattr(ilo, meth)(*args)
-        except hpilo.IloFeatureNotSupported:
-            continue
-        except hpilo.IloError as e:
-            if 'syntax error' in e.message:
-                continue
-        with open(output_file_parsed, 'w') as fd:
-            pprint.pprint(data, stream=fd)
-    print("")
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/xml/generate_requests b/tests/xml/generate_requests
deleted file mode 100755
index 1284b99..0000000
--- a/tests/xml/generate_requests
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/python
-
-import ConfigParser
-import hashlib
-import hpilo
-import optparse
-import os
-import pprint
-import sys
-import time
-import types
-
-# All methods that fetch data use the _info_tag or _control_tag function
-methods = [meth for meth in dir(hpilo.Ilo) 
-            if isinstance(getattr(hpilo.Ilo, meth), types.MethodType)
-            and ('_info_tag' in getattr(hpilo.Ilo, meth).__code__.co_names
-                 or '_control_tag' in getattr(hpilo.Ilo, meth).__code__.co_names)]
-methods.sort()
-method_args = {
-    'activate_license': [['XXXXX-XXXXX-XXXXX-XXXXX-XXXXX']],
-    'add_federation_group': [['TestGroup', 'TestKey', False, False, True]],
-    'add_user': [['TestUser', 'TestPass', 'Test User', True, False]],
-    'cert_fqdn': [[True]],
-    'certificate_signing_request': [[],['NL', 'Flevoland']],
-    'computer_lock_config': [[], [None, 'X']],
-    'delete_federation_group': [['TestGroup']],
-    'delete_user': [['TestUser']],
-    'ers_ahs_submit': [['TestMessage', 'bb days']],
-    'get_federation_group': [['slartibartfast']],
-    'get_user': [['TestUser']],
-    'hotkey_config': [['something', 'something else']],
-    'import_certificate': [['-----BEGIN CERTIFICATE-----\nMIIEJjCCAw6gAwIBAgIBADANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJOTDES\n-----END CERTIFICATE-----']],
-    'import_ssh_key': [['TestUser', 'ssh-rsa VGVzdCBrZXk= Test Key']],
-    'delete_ssh_key': [['TestUser']],
-    'insert_virtual_media': [['CDROM', 'http://localhost/os.iso']],
-    'mod_dir_config': [[True, True, 'ldap.example.com', 389]],
-    'mod_dir_config': [[True, True, '']],
-    'mod_federation_group': [['TestGroup', None, None, False, False, True]],
-    'mod_global_settings': [
-        {'remote_syslog_enable': True, 'remote_syslog_server_address': '10.1.1.1', 'remote_syslog_port': 514},
-        {'http_port': 80, 'https_port': 443, 'snmp_access_enabled': False},
-    ],
-    'mod_network_settings': [
-        {'dhcp_enable': True, 'shared_network_port_vlan_id': 42},
-        {'dhcp_enable': False, 'dns_name': 'example-server', 'domain_name': 'ilos.example.com',
-         'ip_address': '10.1.1.1', 'subnet_mask': '255.255.255.0', 'gateway_ip_address': '10.1.1.254'}
-    ],
-    'mod_snmp_im_settings': [[True, '10.1.1.1', '10.1.1.2', 'rocomm', {'value': 'trapcomm', 'version': '2c'}]],
-    'mod_sso_settings': [['TrustMode', True, False, True]],
-    'mod_user': [['TestUser', 'TestUser2', 'TestPassword2', False, True]],
-    'profile_apply': [['TestProfile', 'Action']],
-    'profile_delete': [['TestProfile']],
-    'profile_desc_download': [['TestProfileDesc', 'TestProfile', 'Description']],
-    'set_ahs_status': [[True]],
-    'set_asset_tag': 'NL000001',
-    'set_ers_direct_connect': [['ErsUser', 'ErsPassword', 'ErsProxyHost', 3128]],
-    'set_ers_irs_connect': [['ErsUrl', 9999]],
-    'set_ers_web_proxy': [['ErsProxy', 3128]],
-    'set_federation_multicast': [[False]],
-    'set_language': [['en']],
-    'set_host_power': [[False]],
-    'set_host_power_saver': [['PowerSaver']],
-    'set_one_time_boot': [['BootDevice'], ['floppy']],
-    'set_pending_boot_mode': [['UEFI']],
-    'set_persistent_boot': [['cdrom,floppy,boot_device']],
-    'set_pers_mouse_keyboard_enabled': [[False]],
-    'set_pwreg': [['disabled'],['enabled', 'threshold']],
-    'set_power_cap': [['CAP']],
-    'set_security_msg': [[True, 'Security Message Goes Here']],
-    'set_server_auto_pwr': [[True],[45]],
-    'set_server_fqdn': [['example-server.example.com']],
-    'set_server_name': [['example-server']],
-    'trigger_l2_collection': [['TestMessage']],
-    'trigger_test_event': [['TestMessage']],
-}
-
-def main():
-    usage = """
-  %prog [options] hostname"""
-
-    p = optparse.OptionParser(usage=usage, add_help_option=False)
-    p.add_option("-l", "--login", dest="login", default=None,
-                 help="Username to access the iLO")
-    p.add_option("-p", "--password", dest="password", default=None,
-                 help="Password to access the iLO")
-    p.add_option("-i", "--interactive", action="store_true", default=False,
-                 help="Prompt for username and/or password if they are not specified.")
-    p.add_option("-c", "--config", dest="config", default="~/.ilo.conf",
-                 help="File containing authentication and config details", metavar="FILE")
-    p.add_option("-t", "--timeout", dest="timeout", type="int", default=60,
-                 help="Timeout for iLO connections")
-    p.add_option("-P", "--protocol", dest="protocol", choices=("http","raw","local"), default=None,
-                 help="Use the specified protocol instead of autodetecting")
-    p.add_option("-d", "--debug", dest="debug", action="count", default=0,
-                 help="Output debug information, repeat to see all XML data")
-    p.add_option("-o", "--port", dest="port", type="int", default=443,
-                 help="SSL port to connect to")
-
-    opts, args = p.parse_args()
-
-    if len(args) != 1:
-        p.error("No hostname given")
-
-    hostname = args[0]
-
-    config = ConfigParser.ConfigParser()
-    if os.path.exists(os.path.expanduser(opts.config)):
-        config.read(os.path.expanduser(opts.config))
-
-    login = None
-    password = None
-    needs_login = True
-    if hostname == 'localhost':
-        opts.protocol = 'local'
-        needs_login = False
-    if needs_login:
-        if config.has_option('ilo', 'login'):
-            login = config.get('ilo', 'login')
-        if config.has_option('ilo', 'password'):
-            password = config.get('ilo', 'password')
-        if opts.login:
-            login = opts.login
-        if opts.password:
-            password = opts.password
-        if not login or not password:
-            if opts.interactive:
-                while not login:
-                    login = input('Login for iLO at %s: ' % hostname)
-                while not password:
-                    password = getpass.getpass('Password for %s@%s:' % (login, hostname))
-            else:
-                p.error("No login details provided")
-
-    opts.protocol = {
-        'http':  hpilo.ILO_HTTP,
-        'raw':   hpilo.ILO_RAW,
-        'local': hpilo.ILO_LOCAL,
-    }.get(opts.protocol, None)
-
-    ilo = hpilo.Ilo(hostname, login, password, opts.timeout, opts.port, opts.protocol)
-    ilo.debug = opts.debug
-    if config.has_option('ilo', 'hponcfg'):
-        ilo.hponcfg = config.get('ilo', 'hponcfg')
-    fw_version = ilo.get_fw_version()
-    host_data = ilo.get_host_data()
-    product_name = None
-    for data in host_data:
-        if 'Product Name' in data:
-            product_name = data['Product Name']
-            break
-    else:
-        raise RuntimeError("No product name found")
-    ilo.login = 'Administrator'
-    ilo.password = 'TestPassword'
-    output_dir = '%s - %s %s' % (product_name, fw_version['management_processor'], fw_version['firmware_version'])
-    missing_only = False
-    if os.path.exists(output_dir):
-        answer = raw_input("I already have output for %s, regenerate? [(y)es/(m)issing only/(N)o] " % output_dir).lower()
-        if answer == 'n':
-            sys.exit(0)
-        missing_only = answer == 'm'
-    else:
-        os.makedirs(output_dir)
-    print("Generating data for %s" % output_dir)
-    output_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), output_dir)
-    for number, meth in enumerate(methods):
-        sys.stdout.write('\r\033[K%s (%d/%d)' % (meth, number+1, len(methods)))
-        sys.stdout.flush()
-        for args in method_args.get(meth, [[]]):
-            argsf = pprint.pformat(args)
-            sha1 = hashlib.new('sha1')
-            sha1.update(argsf)
-            ident = sha1.hexdigest()[:8]
-            output_file_args = os.path.join(output_dir, '%s-%s.args' % (meth, ident))
-            output_file_req = os.path.join(output_dir, '%s-%s.request' % (meth, ident))
-            if os.path.exists(output_file_req):
-                if missing_only:
-                    continue
-                else:
-                    os.unlink(output_file_req)
-            with open(output_file_args, 'w') as fd:
-                fd.write(argsf)
-            ilo.save_request = output_file_req
-            try:
-                if isinstance(args, dict):
-                    data = getattr(ilo, meth)(**args)
-                else:
-                    data = getattr(ilo, meth)(*args)
-            except ValueError:
-                if meth.startswith('get'):
-                    raise
-                continue
-    print("")
-
-if __name__ == '__main__':
-    main()

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/doc/python-hpilo-doc/examples/elasticsearch/.gitignore
lrwxrwxrwx  root/root   /usr/share/doc/python-hpilo-doc/html/_static/sphinx_highlight.js -> ../../../../javascript/sphinxdoc/1.0/sphinx_highlight.js

Control files of package python-hpilo-doc: lines which differ (wdiff format)

  • Depends: libjs-sphinxdoc (>= 5.2), 5.0), sphinx-rtd-theme-common (>= 1.2.0+dfsg) 1.1.1+dfsg)

No differences were encountered between the control files of package python3-hpilo

More details

Full run details