diff --git a/tests/data/metadata/fence_aws_vpc.xml b/tests/data/metadata/fence_aws_vpc.xml
index a3ba78fb..e9ee6e99 100644
--- a/tests/data/metadata/fence_aws_vpc.xml
+++ b/tests/data/metadata/fence_aws_vpc.xml
@@ -1,44 +1,174 @@
 <?xml version="1.0" ?>
 <resource-agent name="fence_aws_vpc" shortdesc="Fence agent for AWS VPC" >
 <longdesc>fence_aws_vpc is a Power Fencing agent for AWS VPC that works by manipulating security groups. It uses the boto3 library to connect to AWS.
 
 boto3 can be configured with AWS CLI or by creating ~/.aws/credentials.
 For instructions see: https://boto3.readthedocs.io/en/latest/guide/quickstart.html#configuration</longdesc>
 <vendor-url>http://www.amazon.com</vendor-url>
 <parameters>
-        <parameter name="action" unique="0" required="1">
-                <getopt mixed="-o, --action=[action]" />
-                <content type="string" default="reboot"  />
-                <shortdesc lang="en">Fencing action</shortdesc>
-        </parameter>
-        <parameter name="region" unique="0" required="0">
-                <getopt mixed="-r, --region=[region]" />
-                <content type="string"  />
-                <shortdesc lang="en">AWS Region.</shortdesc>
-        </parameter>
-        <parameter name="access_key" unique="0" required="0">
-                <getopt mixed="-a, --access-key=[key]" />
-                <content type="string"  />
-                <shortdesc lang="en">AWS Access Key.</shortdesc>
-        </parameter>
-        <parameter name="secret_key" unique="0" required="0">
-                <getopt mixed="-s, --secret-key=[key]" />
-                <content type="string"  />
-                <shortdesc lang="en">AWS Secret Key.</shortdesc>
-        </parameter>
-        <parameter name="secg" unique="0" required="0">
-                <getopt mixed="-g --secg=[sg1,sg2,...]" />
-                <content type="string"  />
-                <shortdesc lang="en">Security Groups to remove.</shortdesc>
-        </parameter>
-        <parameter name="plug" unique="0" required="1">
-                <getopt mixed="-n, --plug=[id]" />
-                <content type="string"  />
-                <shortdesc lang="en">Target instance identifier.</shortdesc>
-        </parameter>
-        <parameter name="skip_race_check" unique="0" required="0">
-                <getopt mixed="--skip-race-check" />
-                <content type="boolean"  />
-                <shortdesc lang="en">Skip race condition check.</shortdesc>
-        </parameter>
-
+	<parameter name="action" unique="0" required="1">
+		<getopt mixed="-o, --action=[action]" />
+		<content type="string" default="reboot"  />
+		<shortdesc lang="en">Fencing action</shortdesc>
+	</parameter>
+	<parameter name="region" unique="0" required="0">
+		<getopt mixed="-r, --region=[region]" />
+		<content type="string"  />
+		<shortdesc lang="en">AWS Region.</shortdesc>
+	</parameter>
+	<parameter name="access_key" unique="0" required="0">
+		<getopt mixed="-a, --access-key=[key]" />
+		<content type="string"  />
+		<shortdesc lang="en">AWS Access Key.</shortdesc>
+	</parameter>
+	<parameter name="secret_key" unique="0" required="0">
+		<getopt mixed="-s, --secret-key=[key]" />
+		<content type="string"  />
+		<shortdesc lang="en">AWS Secret Key.</shortdesc>
+	</parameter>
+	<parameter name="secg" unique="0" required="0">
+		<getopt mixed="-g --secg=[sg1,sg2,...]" />
+		<content type="string"  />
+		<shortdesc lang="en">Security Groups to remove.</shortdesc>
+	</parameter>
+	<parameter name="plug" unique="0" required="1">
+		<getopt mixed="-n, --plug=[id]" />
+		<content type="string"  />
+		<shortdesc lang="en">Target instance identifier.</shortdesc>
+	</parameter>
+	<parameter name="skip_race_check" unique="0" required="0">
+		<getopt mixed="--skip-race-check" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Skip race condition check.</shortdesc>
+	</parameter>
+	<parameter name="invert-sg-removal" unique="0" required="0" deprecated="1">
+		<getopt mixed="--invert-sg-removal" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Remove all security groups except specified..</shortdesc>
+	</parameter>
+	<parameter name="invert_sg_removal" unique="0" required="0" obsoletes="invert-sg-removal">
+		<getopt mixed="--invert-sg-removal" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Remove all security groups except specified..</shortdesc>
+	</parameter>
+	<parameter name="unfence-ignore-restore" unique="0" required="0" deprecated="1">
+		<getopt mixed="--unfence-ignore-restore" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Remove all security groups except specified..</shortdesc>
+	</parameter>
+	<parameter name="unfence_ignore_restore" unique="0" required="0" obsoletes="unfence-ignore-restore">
+		<getopt mixed="--unfence-ignore-restore" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Remove all security groups except specified..</shortdesc>
+	</parameter>
+	<parameter name="filter" unique="0" required="0">
+		<getopt mixed="--filter=[key=value]" />
+		<content type="string"  />
+		<shortdesc lang="en">Filter for list-action</shortdesc>
+	</parameter>
+	<parameter name="boto3_debug" unique="0" required="0">
+		<getopt mixed="-b, --boto3_debug=[option]" />
+		<content type="string" default="False"  />
+		<shortdesc lang="en">Boto Lib debug</shortdesc>
+	</parameter>
+	<parameter name="onfence-poweroff" unique="0" required="0" deprecated="1">
+		<getopt mixed="--onfence-poweroff" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Power off the machine async..</shortdesc>
+	</parameter>
+	<parameter name="onfence_poweroff" unique="0" required="0" obsoletes="onfence-poweroff">
+		<getopt mixed="--onfence-poweroff" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Power off the machine async..</shortdesc>
+	</parameter>
+	<parameter name="quiet" unique="0" required="0">
+		<getopt mixed="-q, --quiet" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
+	</parameter>
+	<parameter name="verbose" unique="0" required="0">
+		<getopt mixed="-v, --verbose" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
+	</parameter>
+	<parameter name="verbose_level" unique="0" required="0">
+		<getopt mixed="--verbose-level" />
+		<content type="integer"  />
+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
+	</parameter>
+	<parameter name="debug" unique="0" required="0" deprecated="1">
+		<getopt mixed="-D, --debug-file=[debugfile]" />
+		<content type="string"  />
+		<shortdesc lang="en">Write debug information to given file</shortdesc>
+	</parameter>
+	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+		<getopt mixed="-D, --debug-file=[debugfile]" />
+		<shortdesc lang="en">Write debug information to given file</shortdesc>
+	</parameter>
+	<parameter name="version" unique="0" required="0">
+		<getopt mixed="-V, --version" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Display version information and exit</shortdesc>
+	</parameter>
+	<parameter name="help" unique="0" required="0">
+		<getopt mixed="-h, --help" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Display help and exit</shortdesc>
+	</parameter>
+	<parameter name="plug_separator" unique="0" required="0">
+		<getopt mixed="--plug-separator=[char]" />
+		<content type="string" default=","  />
+		<shortdesc lang="en">Separator for plug parameter when specifying more than 1 plug</shortdesc>
+	</parameter>
+	<parameter name="delay" unique="0" required="0">
+		<getopt mixed="--delay=[seconds]" />
+		<content type="second" default="0"  />
+		<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
+	</parameter>
+	<parameter name="disable_timeout" unique="0" required="0">
+		<getopt mixed="--disable-timeout=[true/false]" />
+		<content type="string"  />
+		<shortdesc lang="en">Disable timeout (true/false) (default: true when run from Pacemaker 2.0+)</shortdesc>
+	</parameter>
+	<parameter name="login_timeout" unique="0" required="0">
+		<getopt mixed="--login-timeout=[seconds]" />
+		<content type="second" default="5"  />
+		<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
+	</parameter>
+	<parameter name="power_timeout" unique="0" required="0">
+		<getopt mixed="--power-timeout=[seconds]" />
+		<content type="second" default="20"  />
+		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
+	</parameter>
+	<parameter name="power_wait" unique="0" required="0">
+		<getopt mixed="--power-wait=[seconds]" />
+		<content type="second" default="0"  />
+		<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
+	</parameter>
+	<parameter name="shell_timeout" unique="0" required="0">
+		<getopt mixed="--shell-timeout=[seconds]" />
+		<content type="second" default="3"  />
+		<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
+	</parameter>
+	<parameter name="stonith_status_sleep" unique="0" required="0">
+		<getopt mixed="--stonith-status-sleep=[seconds]" />
+		<content type="second" default="1"  />
+		<shortdesc lang="en">Sleep X seconds between status calls during a STONITH action</shortdesc>
+	</parameter>
+	<parameter name="retry_on" unique="0" required="0">
+		<getopt mixed="--retry-on=[attempts]" />
+		<content type="integer" default="1"  />
+		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+	</parameter>
+</parameters>
+<actions>
+	<action name="on" automatic="0"/>
+	<action name="off" />
+	<action name="reboot" />
+	<action name="status" />
+	<action name="monitor" />
+	<action name="metadata" />
+	<action name="manpage" />
+	<action name="validate-all" />
+</actions>
+</resource-agent>