diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index eac3f88..9ec2016 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.atmos.endpoint>https://accesspoint.atmosonline.com</test.atmos.endpoint>
     <test.atmos.api-version>1.3.0</test.atmos.api-version>
-    <test.atmos.build-version></test.atmos.build-version>
+    <test.atmos.build-version />
     <test.atmos.identity>FIXME</test.atmos.identity>
     <test.atmos.credential>FIXME</test.atmos.credential>
   </properties>
diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index 44d0fc5..92c9dc0 100644
--- a/apis/byon/pom.xml
+++ b/apis/byon/pom.xml
@@ -35,7 +35,7 @@
 
   <properties>
     <test.byon.endpoint>file://c:/test.txt</test.byon.endpoint>
-    <test.byon.sudo-password></test.byon.sudo-password>
+    <test.byon.sudo-password />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml
index 13bb997..0b1ef22 100644
--- a/apis/cloudfiles/pom.xml
+++ b/apis/cloudfiles/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.cloudfiles.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles.endpoint>
     <test.cloudfiles.api-version>1.0</test.cloudfiles.api-version>
-    <test.cloudfiles.build-version></test.cloudfiles.build-version>
+    <test.cloudfiles.build-version />
     <test.cloudfiles.identity>${test.rackspace.identity}</test.cloudfiles.identity>
     <test.cloudfiles.credential>${test.rackspace.credential}</test.cloudfiles.credential>
   </properties>
diff --git a/apis/cloudloadbalancers/pom.xml b/apis/cloudloadbalancers/pom.xml
index c2a1e08..8f96a0b 100644
--- a/apis/cloudloadbalancers/pom.xml
+++ b/apis/cloudloadbalancers/pom.xml
@@ -36,7 +36,7 @@
    <properties>
     <test.cloudloadbalancers.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers.endpoint>
     <test.cloudloadbalancers.api-version>1.0</test.cloudloadbalancers.api-version>
-    <test.cloudloadbalancers.build-version></test.cloudloadbalancers.build-version>
+    <test.cloudloadbalancers.build-version />
     <test.cloudloadbalancers.identity>${test.rackspace.identity}</test.cloudloadbalancers.identity>
     <test.cloudloadbalancers.credential>${test.rackspace.credential}</test.cloudloadbalancers.credential>
   </properties>
diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml
index d3ecc8f..c10f227 100644
--- a/apis/cloudservers/pom.xml
+++ b/apis/cloudservers/pom.xml
@@ -37,12 +37,12 @@
   <properties>
     <test.cloudservers.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers.endpoint>
     <test.cloudservers.api-version>1.0</test.cloudservers.api-version>
-    <test.cloudservers.build-version></test.cloudservers.build-version>
+    <test.cloudservers.build-version />
     <test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
     <test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
-    <test.cloudservers.image-id></test.cloudservers.image-id>
-    <test.cloudservers.image.login-user></test.cloudservers.image.login-user>
-    <test.cloudservers.image.authenticate-sudo></test.cloudservers.image.authenticate-sudo>
+    <test.cloudservers.image-id />
+    <test.cloudservers.image.login-user />
+    <test.cloudservers.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml
index abb3643..e44d5ac 100644
--- a/apis/cloudsigma/pom.xml
+++ b/apis/cloudsigma/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.cloudsigma.endpoint>https://api.cloudsigma.com</test.cloudsigma.endpoint>
     <test.cloudsigma.api-version>1.0</test.cloudsigma.api-version>
-    <test.cloudsigma.build-version></test.cloudsigma.build-version>
+    <test.cloudsigma.build-version />
     <test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
     <test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
     <test.cloudsigma.image-id>f3c7c665-cd54-4a78-8fd2-7ec2f028cf29</test.cloudsigma.image-id>
-    <test.cloudsigma.image.login-user></test.cloudsigma.image.login-user>
-    <test.cloudsigma.image.authenticate-sudo></test.cloudsigma.image.authenticate-sudo>
+    <test.cloudsigma.image.login-user />
+    <test.cloudsigma.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml
index da995d6..f74c2df 100644
--- a/apis/cloudstack/pom.xml
+++ b/apis/cloudstack/pom.xml
@@ -50,16 +50,16 @@
   <properties>
     <test.cloudstack.endpoint>http://localhost:8080/client/api</test.cloudstack.endpoint>
     <test.cloudstack.api-version>2.2.12</test.cloudstack.api-version>
-    <test.cloudstack.build-version></test.cloudstack.build-version>
+    <test.cloudstack.build-version />
     <test.cloudstack.identity>FIXME_apiKey</test.cloudstack.identity>
     <test.cloudstack.credential>FIXME_secretKey</test.cloudstack.credential>
-    <test.cloudstack.domainAdminIdentity></test.cloudstack.domainAdminIdentity>
-    <test.cloudstack.domainAdminCredential></test.cloudstack.domainAdminCredential>
-    <test.cloudstack.globalAdminIdentity></test.cloudstack.globalAdminIdentity>
-    <test.cloudstack.globalAdminCredential></test.cloudstack.globalAdminCredential>
-    <test.cloudstack.image-id></test.cloudstack.image-id>
-    <test.cloudstack.image.login-user></test.cloudstack.image.login-user>
-    <test.cloudstack.image.authenticate-sudo></test.cloudstack.image.authenticate-sudo>
+    <test.cloudstack.domainAdminIdentity />
+    <test.cloudstack.domainAdminCredential />
+    <test.cloudstack.globalAdminIdentity />
+    <test.cloudstack.globalAdminCredential />
+    <test.cloudstack.image-id />
+    <test.cloudstack.image.login-user />
+    <test.cloudstack.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml
index 8f8e467..66a6e53 100644
--- a/apis/deltacloud/pom.xml
+++ b/apis/deltacloud/pom.xml
@@ -50,12 +50,12 @@
   <properties>
     <test.deltacloud.endpoint>http://localhost:3001/api</test.deltacloud.endpoint>
     <test.deltacloud.api-version>0.3.0</test.deltacloud.api-version>
-    <test.deltacloud.build-version></test.deltacloud.build-version>
+    <test.deltacloud.build-version />
     <test.deltacloud.identity>mockuser</test.deltacloud.identity>
     <test.deltacloud.credential>mockpassword</test.deltacloud.credential>
-    <test.deltacloud.image-id></test.deltacloud.image-id>
-    <test.deltacloud.image.login-user></test.deltacloud.image.login-user>
-    <test.deltacloud.image.authenticate-sudo></test.deltacloud.image.authenticate-sudo>
+    <test.deltacloud.image-id />
+    <test.deltacloud.image.login-user />
+    <test.deltacloud.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index 08d90c6..8743d79 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.ec2.endpoint>
     <test.ec2.api-version>2010-06-15</test.ec2.api-version>
-    <test.ec2.build-version></test.ec2.build-version>
+    <test.ec2.build-version />
     <test.ec2.identity>${test.aws.identity}</test.ec2.identity>
     <test.ec2.credential>${test.aws.credential}</test.ec2.credential>
-    <test.ec2.image-id></test.ec2.image-id>
-    <test.ec2.image.login-user></test.ec2.image.login-user>
-    <test.ec2.image.authenticate-sudo></test.ec2.image.authenticate-sudo>
+    <test.ec2.image-id />
+    <test.ec2.image.login-user />
+    <test.ec2.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml
index dd17c4e..78644e8 100644
--- a/apis/elasticstack/pom.xml
+++ b/apis/elasticstack/pom.xml
@@ -50,12 +50,12 @@
   <properties>
     <test.elasticstack.endpoint>https://api.lon-p.elastichosts.com</test.elasticstack.endpoint>
     <test.elasticstack.api-version>1.0</test.elasticstack.api-version>
-    <test.elasticstack.build-version></test.elasticstack.build-version>
+    <test.elasticstack.build-version />
     <test.elasticstack.identity>FIXME</test.elasticstack.identity>
     <test.elasticstack.credential>FIXME</test.elasticstack.credential>
     <test.elasticstack.image-id>38df0986-4d85-4b76-b502-3878ffc80161</test.elasticstack.image-id>
-    <test.elasticstack.image.login-user></test.elasticstack.image.login-user>
-    <test.elasticstack.image.authenticate-sudo></test.elasticstack.image.authenticate-sudo>
+    <test.elasticstack.image.login-user />
+    <test.elasticstack.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml
index af22df3..562747c 100644
--- a/apis/eucalyptus/pom.xml
+++ b/apis/eucalyptus/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.eucalyptus.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus.endpoint>
     <test.eucalyptus.api-version>2010-06-15</test.eucalyptus.api-version>
-    <test.eucalyptus.build-version></test.eucalyptus.build-version>
+    <test.eucalyptus.build-version />
     <test.eucalyptus.identity>FIXME_IDENTITY</test.eucalyptus.identity>
     <test.eucalyptus.credential>FIXME_CREDENTIAL</test.eucalyptus.credential>
-    <test.eucalyptus.image-id></test.eucalyptus.image-id>
-    <test.eucalyptus.image.login-user></test.eucalyptus.image.login-user>
-    <test.eucalyptus.image.authenticate-sudo></test.eucalyptus.image.authenticate-sudo>
+    <test.eucalyptus.image-id />
+    <test.eucalyptus.image.login-user />
+    <test.eucalyptus.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index b308f8c..a5f15a2 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -36,14 +36,14 @@
   <properties>
     <test.nova.endpoint>http://localhost:8773/services/Cloud</test.nova.endpoint>
     <test.nova.api-version>1.1</test.nova.api-version>
-    <test.nova.build-version></test.nova.build-version>
+    <test.nova.build-version />
     <test.nova.identity>FIXME_IDENTITY</test.nova.identity>
     <test.nova.credential>FIXME_CREDENTIALS</test.nova.credential>
-    <test.nova.image-id></test.nova.image-id>
-    <test.nova.image.login-user></test.nova.image.login-user>
-    <test.nova.image.authenticate-sudo></test.nova.image.authenticate-sudo>
-    <test.ssh.keyfile.public></test.ssh.keyfile.public>
-    <test.ssh.keyfile.private></test.ssh.keyfile.private>
+    <test.nova.image-id />
+    <test.nova.image.login-user />
+    <test.nova.image.authenticate-sudo />
+    <test.ssh.keyfile.public />
+    <test.ssh.keyfile.private />
   </properties>
 
   <dependencies>
diff --git a/apis/openstack-nova-ec2/pom.xml b/apis/openstack-nova-ec2/pom.xml
index d7c2abd..e3e6ccd 100644
--- a/apis/openstack-nova-ec2/pom.xml
+++ b/apis/openstack-nova-ec2/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.openstack-nova-ec2.endpoint>http://localhost:8773/services/Cloud</test.openstack-nova-ec2.endpoint>
     <test.openstack-nova-ec2.api-version>2010-06-15</test.openstack-nova-ec2.api-version>
-    <test.openstack-nova-ec2.build-version></test.openstack-nova-ec2.build-version>
+    <test.openstack-nova-ec2.build-version />
     <test.openstack-nova-ec2.identity>FIXME_IDENTITY</test.openstack-nova-ec2.identity>
     <test.openstack-nova-ec2.credential>FIXME_CREDENTIAL</test.openstack-nova-ec2.credential>
-    <test.openstack-nova-ec2.image-id></test.openstack-nova-ec2.image-id>
-    <test.openstack-nova-ec2.image.login-user></test.openstack-nova-ec2.image.login-user>
-    <test.openstack-nova-ec2.image.authenticate-sudo></test.openstack-nova-ec2.image.authenticate-sudo>
+    <test.openstack-nova-ec2.image-id />
+    <test.openstack-nova-ec2.image.login-user />
+    <test.openstack-nova-ec2.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml
index 8e144f7..4f42070 100644
--- a/apis/openstack-nova/pom.xml
+++ b/apis/openstack-nova/pom.xml
@@ -38,12 +38,12 @@
     <test.openstack-nova.endpoint>http://localhost:5000</test.openstack-nova.endpoint>
     <!-- keystone version -->
     <test.openstack-nova.api-version>1.1</test.openstack-nova.api-version>
-    <test.openstack-nova.build-version></test.openstack-nova.build-version>
+    <test.openstack-nova.build-version />
     <test.openstack-nova.identity>FIXME_IDENTITY</test.openstack-nova.identity>
     <test.openstack-nova.credential>FIXME_CREDENTIALS</test.openstack-nova.credential>
-    <test.openstack-nova.image-id></test.openstack-nova.image-id>
-    <test.openstack-nova.image.login-user></test.openstack-nova.image.login-user>
-    <test.openstack-nova.image.authenticate-sudo></test.openstack-nova.image.authenticate-sudo>
+    <test.openstack-nova.image-id />
+    <test.openstack-nova.image.login-user />
+    <test.openstack-nova.image.authenticate-sudo />
     <test.jclouds.openstack-nova.auto-allocate-floating-ips>false</test.jclouds.openstack-nova.auto-allocate-floating-ips>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
   </properties>
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index ba491d8..821775e 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.s3.endpoint>https://s3.amazonaws.com</test.s3.endpoint>
     <test.s3.api-version>2006-03-01</test.s3.api-version>
-    <test.s3.build-version></test.s3.build-version>
+    <test.s3.build-version />
     <test.s3.identity>${test.aws.identity}</test.s3.identity>
     <test.s3.credential>${test.aws.credential}</test.s3.credential>
   </properties>
diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml
index cab2eb7..30a3356 100644
--- a/apis/swift/pom.xml
+++ b/apis/swift/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.swift.endpoint>http://localhost:11000</test.swift.endpoint>
     <test.swift.api-version>1.0</test.swift.api-version>
-    <test.swift.build-version></test.swift.build-version>
+    <test.swift.build-version />
     <test.swift.identity>test:tester</test.swift.identity>
     <test.swift.credential>testing</test.swift.credential>
   </properties>
diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml
index 1c8c524..c4751b7 100644
--- a/apis/vcloud/pom.xml
+++ b/apis/vcloud/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.vcloud.endpoint>FIXME</test.vcloud.endpoint>
     <test.vcloud.api-version>1.0</test.vcloud.api-version>
-    <test.vcloud.build-version></test.vcloud.build-version>
+    <test.vcloud.build-version />
     <test.vcloud.identity>FIXME</test.vcloud.identity>
     <test.vcloud.credential>FIXME</test.vcloud.credential>
-    <test.vcloud.image-id></test.vcloud.image-id>
-    <test.vcloud.image.login-user></test.vcloud.image.login-user>
-    <test.vcloud.image.authenticate-sudo></test.vcloud.image.authenticate-sudo>
+    <test.vcloud.image-id />
+    <test.vcloud.image.login-user />
+    <test.vcloud.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml
index 553d6bc..95dbf41 100644
--- a/apis/walrus/pom.xml
+++ b/apis/walrus/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.walrus.endpoint>http://ecc.eucalyptus.com:8773/services/Walrus</test.walrus.endpoint>
     <test.walrus.api-version>2006-03-01</test.walrus.api-version>
-    <test.walrus.build-version></test.walrus.build-version>
+    <test.walrus.build-version />
     <test.walrus.identity>${test.eucalyptus.identity}</test.walrus.identity>
     <test.walrus.credential>${test.eucalyptus.credential}</test.walrus.credential>
   </properties>
diff --git a/labs/aws-elb/pom.xml b/labs/aws-elb/pom.xml
index c4a4395..aebbd59 100644
--- a/labs/aws-elb/pom.xml
+++ b/labs/aws-elb/pom.xml
@@ -36,16 +36,16 @@
     <properties>
         <test.aws-elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.aws-elb.endpoint>
         <test.aws-elb.api-version>2010-07-01</test.aws-elb.api-version>
-        <test.aws-elb.build-version></test.aws-elb.build-version>
+        <test.aws-elb.build-version />
         <test.aws-elb.identity>${test.aws.identity}</test.aws-elb.identity>
         <test.aws-elb.credential>${test.aws.credential}</test.aws-elb.credential>
         <test.aws-elb.compute.provider>aws-ec2</test.aws-elb.compute.provider>
         <test.aws-elb.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-elb.compute.endpoint>
         <test.aws-elb.compute.api-version>2010-06-15</test.aws-elb.compute.api-version>
-        <test.aws-elb.compute.build-version></test.aws-elb.compute.build-version>
+        <test.aws-elb.compute.build-version />
         <test.aws-elb.compute.identity>${test.aws.identity}</test.aws-elb.compute.identity>
         <test.aws-elb.compute.credential>${test.aws.credential}</test.aws-elb.compute.credential>
-        <test.aws-elb.compute.image-id></test.aws-elb.compute.image-id>
+        <test.aws-elb.compute.image-id />
     </properties>
 
     <dependencies>
diff --git a/labs/elb/pom.xml b/labs/elb/pom.xml
index e1cd5f7..a3c0335 100644
--- a/labs/elb/pom.xml
+++ b/labs/elb/pom.xml
@@ -37,16 +37,16 @@
         <test.elb.zone>us-east-1a</test.elb.zone>
         <test.elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.elb.endpoint>
         <test.elb.api-version>2010-07-01</test.elb.api-version>
-        <test.elb.build-version></test.elb.build-version>
+        <test.elb.build-version />
         <test.elb.identity>${test.aws.identity}</test.elb.identity>
         <test.elb.credential>${test.aws.credential}</test.elb.credential>
         <test.elb.compute.provider>aws-ec2</test.elb.compute.provider>
         <test.elb.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.elb.compute.endpoint>
         <test.elb.compute.api-version>2010-06-15</test.elb.compute.api-version>
-        <test.elb.compute.build-version></test.elb.compute.build-version>
+        <test.elb.compute.build-version />
         <test.elb.compute.identity>${test.aws.identity}</test.elb.compute.identity>
         <test.elb.compute.credential>${test.aws.credential}</test.elb.compute.credential>
-        <test.elb.compute.image-id></test.elb.compute.image-id>
+        <test.elb.compute.image-id />
     </properties>
 
     <dependencies>
diff --git a/labs/glesys/pom.xml b/labs/glesys/pom.xml
index cbf2ab5..99bde2a 100644
--- a/labs/glesys/pom.xml
+++ b/labs/glesys/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.glesys.endpoint>https://api.glesys.com</test.glesys.endpoint>
     <test.glesys.api-version>1</test.glesys.api-version>
-    <test.glesys.build-version></test.glesys.build-version>
+    <test.glesys.build-version />
     <test.glesys.identity>FIXME</test.glesys.identity>
     <test.glesys.credential>FIXME</test.glesys.credential>
-    <test.glesys.image-id></test.glesys.image-id>
-    <test.glesys.image.login-user></test.glesys.image.login-user>
-    <test.glesys.image.authenticate-sudo></test.glesys.image.authenticate-sudo>
+    <test.glesys.image-id />
+    <test.glesys.image.login-user />
+    <test.glesys.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/labs/opsource-servers/pom.xml b/labs/opsource-servers/pom.xml
index ef4eb9c..78adff9 100644
--- a/labs/opsource-servers/pom.xml
+++ b/labs/opsource-servers/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.opsource-servers.endpoint>https://api.opsourcecloud.net/oec/${jclouds.api-version}</test.opsource-servers.endpoint>
     <test.opsource-servers.api-version>0.9</test.opsource-servers.api-version>
-    <test.opsource-servers.build-version></test.opsource-servers.build-version>
+    <test.opsource-servers.build-version />
     <test.opsource-servers.identity>FIXME_USERNAME</test.opsource-servers.identity>
     <test.opsource-servers.credential>FIXME_PASSWORD</test.opsource-servers.credential>
-    <test.opsource-servers.image-id></test.opsource-servers.image-id>
-    <test.opsource-servers.image.login-user></test.opsource-servers.image.login-user>
-    <test.opsource-servers.image.authenticate-sudo></test.opsource-servers.image.authenticate-sudo>
+    <test.opsource-servers.image-id />
+    <test.opsource-servers.image.login-user />
+    <test.opsource-servers.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/labs/savvis-symphonyvpdc/pom.xml b/labs/savvis-symphonyvpdc/pom.xml
index 312eb29..8cee793 100644
--- a/labs/savvis-symphonyvpdc/pom.xml
+++ b/labs/savvis-symphonyvpdc/pom.xml
@@ -39,7 +39,7 @@
         <test.savvis-symphonyvpdc.build-version>2.3</test.savvis-symphonyvpdc.build-version>
         <test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
         <test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
-        <test.savvis-symphonyvpdc.image-id></test.savvis-symphonyvpdc.image-id>
+        <test.savvis-symphonyvpdc.image-id />
         <test.savvis-symphonyvpdc.vdc-email>FIXME</test.savvis-symphonyvpdc.vdc-email>
         <test.savvis-symphonyvpdc.loginUser>FIXME</test.savvis-symphonyvpdc.loginUser>
         <test.savvis-symphonyvpdc.loginPassword>FIXME</test.savvis-symphonyvpdc.loginPassword>
diff --git a/labs/vcloud-director/pom.xml b/labs/vcloud-director/pom.xml
index cf2258d..9bb37fe 100644
--- a/labs/vcloud-director/pom.xml
+++ b/labs/vcloud-director/pom.xml
@@ -39,7 +39,6 @@
     <test.vcloud-director.build-version>1.5.0.464915</test.vcloud-director.build-version>
     <test.vcloud-director.identity>FIXME_USERNAME_WHICH_MIGHT_BE_EMAIL@JClouds</test.vcloud-director.identity>
     <test.vcloud-director.credential>FIXME_PASSWORD</test.vcloud-director.credential>
-    <test.vcloud-director.image-id></test.vcloud-director.image-id>
     <test.vcloud-director.image.login-user></test.vcloud-director.image.login-user>
     <test.vcloud-director.image.authenticate-sudo></test.vcloud-director.image.authenticate-sudo>
     <test.vcloud-director.catalog-id></test.vcloud-director.catalog-id>
diff --git a/labs/virtualbox/pom.xml b/labs/virtualbox/pom.xml
index 89fcceb..fd78a46 100644
--- a/labs/virtualbox/pom.xml
+++ b/labs/virtualbox/pom.xml
@@ -19,8 +19,7 @@
   under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jclouds</groupId>
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index 8884235..61b2998 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.aws-ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-ec2.endpoint>
     <test.aws-ec2.api-version>2011-05-15</test.aws-ec2.api-version>
-    <test.aws-ec2.build-version></test.aws-ec2.build-version>
+    <test.aws-ec2.build-version />
     <test.aws-ec2.identity>${test.aws.identity}</test.aws-ec2.identity>
     <test.aws-ec2.credential>${test.aws.credential}</test.aws-ec2.credential>
-    <test.aws-ec2.image-id></test.aws-ec2.image-id>
-    <test.aws-ec2.image.login-user></test.aws-ec2.image.login-user>
-    <test.aws-ec2.image.authenticate-sudo></test.aws-ec2.image.authenticate-sudo>
+    <test.aws-ec2.image-id />
+    <test.aws-ec2.image.login-user />
+    <test.aws-ec2.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml
index 504b13d..a596997 100644
--- a/providers/aws-s3/pom.xml
+++ b/providers/aws-s3/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer</test.initializer>
         <test.aws-s3.endpoint>https://s3.amazonaws.com</test.aws-s3.endpoint>
         <test.aws-s3.api-version>2006-03-01</test.aws-s3.api-version>
-        <test.aws-s3.build-version></test.aws-s3.build-version>
+        <test.aws-s3.build-version />
         <test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
         <test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
         <test.blobstore.container-count>25</test.blobstore.container-count>
diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml
index 73f56cc..818b5ca 100644
--- a/providers/azureblob/pom.xml
+++ b/providers/azureblob/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.azureblob.endpoint>https://${jclouds.identity}.blob.core.windows.net</test.azureblob.endpoint>
         <test.azureblob.api-version>2009-09-19</test.azureblob.api-version>
-        <test.azureblob.build-version></test.azureblob.build-version>
+        <test.azureblob.build-version />
         <test.azureblob.identity>${test.azure.identity}</test.azureblob.identity>
         <test.azureblob.credential>${test.azure.credential}</test.azureblob.credential>
     </properties>
diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml
index 1c42fd9..fd6a6bd 100644
--- a/providers/bluelock-vcloud-zone01/pom.xml
+++ b/providers/bluelock-vcloud-zone01/pom.xml
@@ -39,9 +39,9 @@
     <test.bluelock-vcloud-zone01.build-version>1.5.0.464915</test.bluelock-vcloud-zone01.build-version>
     <test.bluelock-vcloud-zone01.identity>FIXME_IDENTITY</test.bluelock-vcloud-zone01.identity>
     <test.bluelock-vcloud-zone01.credential>FIXME_CREDENTIAL</test.bluelock-vcloud-zone01.credential>
-    <test.bluelock-vcloud-zone01.image-id></test.bluelock-vcloud-zone01.image-id>
-    <test.bluelock-vcloud-zone01.image.login-user></test.bluelock-vcloud-zone01.image.login-user>
-    <test.bluelock-vcloud-zone01.image.authenticate-sudo></test.bluelock-vcloud-zone01.image.authenticate-sudo>
+    <test.bluelock-vcloud-zone01.image-id />
+    <test.bluelock-vcloud-zone01.image.login-user />
+    <test.bluelock-vcloud-zone01.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml
index d53054c..9a1a8a4 100644
--- a/providers/cloudfiles-uk/pom.xml
+++ b/providers/cloudfiles-uk/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudfiles-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudfiles-uk.endpoint>
         <test.cloudfiles-uk.api-version>1.0</test.cloudfiles-uk.api-version>
-        <test.cloudfiles-uk.build-version></test.cloudfiles-uk.build-version>
+        <test.cloudfiles-uk.build-version />
         <test.cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.cloudfiles-uk.identity>
         <test.cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.cloudfiles-uk.credential>
     </properties>
diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml
index 5f060dc..4f64016 100644
--- a/providers/cloudfiles-us/pom.xml
+++ b/providers/cloudfiles-us/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer</test.initializer>
         <test.cloudfiles-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles-us.endpoint>
         <test.cloudfiles-us.api-version>1.0</test.cloudfiles-us.api-version>
-        <test.cloudfiles-us.build-version></test.cloudfiles-us.build-version>
+        <test.cloudfiles-us.build-version />
         <test.cloudfiles-us.identity>${test.rackspace-us.identity}</test.cloudfiles-us.identity>
         <test.cloudfiles-us.credential>${test.rackspace-us.credential}</test.cloudfiles-us.credential>
     </properties>
diff --git a/providers/cloudloadbalancers-uk/pom.xml b/providers/cloudloadbalancers-uk/pom.xml
index 3bf8bed..dd4cec0 100644
--- a/providers/cloudloadbalancers-uk/pom.xml
+++ b/providers/cloudloadbalancers-uk/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudloadbalancers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudloadbalancers-uk.endpoint>
         <test.cloudloadbalancers-uk.api-version>1.0</test.cloudloadbalancers-uk.api-version>
-        <test.cloudloadbalancers-uk.build-version></test.cloudloadbalancers-uk.build-version>
+        <test.cloudloadbalancers-uk.build-version />
         <test.cloudloadbalancers-uk.identity>${test.rackspace-uk.identity}</test.cloudloadbalancers-uk.identity>
         <test.cloudloadbalancers-uk.credential>${test.rackspace-uk.credential}</test.cloudloadbalancers-uk.credential>
     </properties>
diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml
index ddc4d94..f7701c0 100644
--- a/providers/cloudloadbalancers-us/pom.xml
+++ b/providers/cloudloadbalancers-us/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudloadbalancers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers-us.endpoint>
         <test.cloudloadbalancers-us.api-version>1.0</test.cloudloadbalancers-us.api-version>
-        <test.cloudloadbalancers-us.build-version></test.cloudloadbalancers-us.build-version>
+        <test.cloudloadbalancers-us.build-version />
         <test.cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.cloudloadbalancers-us.identity>
         <test.cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.cloudloadbalancers-us.credential>
     </properties>
diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml
index 8390b7c..a0fd06a 100644
--- a/providers/cloudonestorage/pom.xml
+++ b/providers/cloudonestorage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudonestorage.endpoint>https://cloudonestorage.peer1.com</test.cloudonestorage.endpoint>
         <test.cloudonestorage.api-version>1.3.0</test.cloudonestorage.api-version>
-        <test.cloudonestorage.build-version></test.cloudonestorage.build-version>
+        <test.cloudonestorage.build-version />
         <test.cloudonestorage.identity>FIXME_IDENTITY</test.cloudonestorage.identity>
         <test.cloudonestorage.credential>FIXME_CREDENTIAL</test.cloudonestorage.credential>
     </properties>
diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml
index 2d321b5..4a5d3da 100644
--- a/providers/cloudservers-uk/pom.xml
+++ b/providers/cloudservers-uk/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.cloudservers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudservers-uk.endpoint>
     <test.cloudservers-uk.api-version>1.0</test.cloudservers-uk.api-version>
-    <test.cloudservers-uk.build-version></test.cloudservers-uk.build-version>
+    <test.cloudservers-uk.build-version />
     <test.cloudservers-uk.identity>${test.rackspace-uk.identity}</test.cloudservers-uk.identity>
     <test.cloudservers-uk.credential>${test.rackspace-uk.credential}</test.cloudservers-uk.credential>
-    <test.cloudservers-uk.image-id></test.cloudservers-uk.image-id>
-    <test.cloudservers-uk.image.login-user></test.cloudservers-uk.image.login-user>
-    <test.cloudservers-uk.image.authenticate-sudo></test.cloudservers-uk.image.authenticate-sudo>
+    <test.cloudservers-uk.image-id />
+    <test.cloudservers-uk.image.login-user />
+    <test.cloudservers-uk.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml
index 30d1d29..3eab26a 100644
--- a/providers/cloudservers-us/pom.xml
+++ b/providers/cloudservers-us/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.cloudservers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers-us.endpoint>
     <test.cloudservers-us.api-version>1.0</test.cloudservers-us.api-version>
-    <test.cloudservers-us.build-version></test.cloudservers-us.build-version>
+    <test.cloudservers-us.build-version />
     <test.cloudservers-us.identity>${test.rackspace-us.identity}</test.cloudservers-us.identity>
     <test.cloudservers-us.credential>${test.rackspace-us.credential}</test.cloudservers-us.credential>
-    <test.cloudservers-us.image-id></test.cloudservers-us.image-id>
-    <test.cloudservers-us.image.login-user></test.cloudservers-us.image.login-user>
-    <test.cloudservers-us.image.authenticate-sudo></test.cloudservers-us.image.authenticate-sudo>
+    <test.cloudservers-us.image-id />
+    <test.cloudservers-us.image.login-user />
+    <test.cloudservers-us.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml
index 79a99bf..24f9064 100644
--- a/providers/cloudsigma-lvs/pom.xml
+++ b/providers/cloudsigma-lvs/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.cloudsigma-lvs.endpoint>https://api.lvs.cloudsigma.com</test.cloudsigma-lvs.endpoint>
     <test.cloudsigma-lvs.api-version>1.0</test.cloudsigma-lvs.api-version>
-    <test.cloudsigma-lvs.build-version></test.cloudsigma-lvs.build-version>
+    <test.cloudsigma-lvs.build-version />
     <test.cloudsigma-lvs.identity>FIXME</test.cloudsigma-lvs.identity>
     <test.cloudsigma-lvs.credential>FIXME</test.cloudsigma-lvs.credential>
-    <test.cloudsigma-lvs.image-id></test.cloudsigma-lvs.image-id>
-    <test.cloudsigma-lvs.image.login-user></test.cloudsigma-lvs.image.login-user>
-    <test.cloudsigma-lvs.image.authenticate-sudo></test.cloudsigma-lvs.image.authenticate-sudo>
+    <test.cloudsigma-lvs.image-id />
+    <test.cloudsigma-lvs.image.login-user />
+    <test.cloudsigma-lvs.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml
index b055df3..158bee9 100644
--- a/providers/cloudsigma-zrh/pom.xml
+++ b/providers/cloudsigma-zrh/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.cloudsigma-zrh.endpoint>https://api.zrh.cloudsigma.com</test.cloudsigma-zrh.endpoint>
     <test.cloudsigma-zrh.api-version>1.0</test.cloudsigma-zrh.api-version>
-    <test.cloudsigma-zrh.build-version></test.cloudsigma-zrh.build-version>
+    <test.cloudsigma-zrh.build-version />
     <test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
     <test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
-    <test.cloudsigma-zrh.image-id></test.cloudsigma-zrh.image-id>
-    <test.cloudsigma-zrh.image.login-user></test.cloudsigma-zrh.image.login-user>
-    <test.cloudsigma-zrh.image.authenticate-sudo></test.cloudsigma-zrh.image.authenticate-sudo>
+    <test.cloudsigma-zrh.image-id />
+    <test.cloudsigma-zrh.image.login-user />
+    <test.cloudsigma-zrh.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml
index 250a691..153abfc 100644
--- a/providers/elastichosts-lax-p/pom.xml
+++ b/providers/elastichosts-lax-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-lax-p.endpoint>https://api.lax-p.elastichosts.com</test.elastichosts-lax-p.endpoint>
         <test.elastichosts-lax-p.api-version>2.0</test.elastichosts-lax-p.api-version>
-        <test.elastichosts-lax-p.build-version></test.elastichosts-lax-p.build-version>
+        <test.elastichosts-lax-p.build-version />
         <test.elastichosts-lax-p.identity>FIXME_IDENTITY</test.elastichosts-lax-p.identity>
         <test.elastichosts-lax-p.credential>FIXME_CREDENTIAL</test.elastichosts-lax-p.credential>
-        <test.elastichosts-lax-p.image-id></test.elastichosts-lax-p.image-id>
+        <test.elastichosts-lax-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml
index 20a2e6a..103ae7f 100644
--- a/providers/elastichosts-lon-b/pom.xml
+++ b/providers/elastichosts-lon-b/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-lon-b.endpoint>https://api.lon-b.elastichosts.com</test.elastichosts-lon-b.endpoint>
         <test.elastichosts-lon-b.api-version>2.0</test.elastichosts-lon-b.api-version>
-        <test.elastichosts-lon-b.build-version></test.elastichosts-lon-b.build-version>
+        <test.elastichosts-lon-b.build-version />
         <test.elastichosts-lon-b.identity>FIXME_IDENTITY</test.elastichosts-lon-b.identity>
         <test.elastichosts-lon-b.credential>FIXME_CREDENTIAL</test.elastichosts-lon-b.credential>
-        <test.elastichosts-lon-b.image-id></test.elastichosts-lon-b.image-id>
+        <test.elastichosts-lon-b.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml
index 95e8ff1..6b94b50 100644
--- a/providers/elastichosts-lon-p/pom.xml
+++ b/providers/elastichosts-lon-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-lon-p.endpoint>https://api.lon-p.elastichosts.com</test.elastichosts-lon-p.endpoint>
         <test.elastichosts-lon-p.api-version>2.0</test.elastichosts-lon-p.api-version>
-        <test.elastichosts-lon-p.build-version></test.elastichosts-lon-p.build-version>
+        <test.elastichosts-lon-p.build-version />
         <test.elastichosts-lon-p.identity>FIXME_IDENTITY</test.elastichosts-lon-p.identity>
         <test.elastichosts-lon-p.credential>FIXME_CREDENTIAL</test.elastichosts-lon-p.credential>
-        <test.elastichosts-lon-p.image-id></test.elastichosts-lon-p.image-id>
+        <test.elastichosts-lon-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml
index c3ba01d..db57d81 100644
--- a/providers/elastichosts-sat-p/pom.xml
+++ b/providers/elastichosts-sat-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-sat-p.endpoint>https://api.sat-p.elastichosts.com</test.elastichosts-sat-p.endpoint>
         <test.elastichosts-sat-p.api-version>2.0</test.elastichosts-sat-p.api-version>
-        <test.elastichosts-sat-p.build-version></test.elastichosts-sat-p.build-version>
+        <test.elastichosts-sat-p.build-version />
         <test.elastichosts-sat-p.identity>FIXME_IDENTITY</test.elastichosts-sat-p.identity>
         <test.elastichosts-sat-p.credential>FIXME_CREDENTIAL</test.elastichosts-sat-p.credential>
-        <test.elastichosts-sat-p.image-id></test.elastichosts-sat-p.image-id>
+        <test.elastichosts-sat-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml
index 02eb2ab..0691c16 100644
--- a/providers/elastichosts-tor-p/pom.xml
+++ b/providers/elastichosts-tor-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-tor-p.endpoint>https://api.tor-p.elastichosts.com</test.elastichosts-tor-p.endpoint>
         <test.elastichosts-tor-p.api-version>2.0</test.elastichosts-tor-p.api-version>
-        <test.elastichosts-tor-p.build-version></test.elastichosts-tor-p.build-version>
+        <test.elastichosts-tor-p.build-version />
         <test.elastichosts-tor-p.identity>FIXME_IDENTITY</test.elastichosts-tor-p.identity>
         <test.elastichosts-tor-p.credential>FIXME_CREDENTIAL</test.elastichosts-tor-p.credential>
-        <test.elastichosts-tor-p.image-id></test.elastichosts-tor-p.image-id>
+        <test.elastichosts-tor-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml
index 214e2b4..8d6cc8b 100644
--- a/providers/eucalyptus-partnercloud-ec2/pom.xml
+++ b/providers/eucalyptus-partnercloud-ec2/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.eucalyptus-partnercloud-ec2.endpoint>http://partnercloud.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus-partnercloud-ec2.endpoint>
         <test.eucalyptus-partnercloud-ec2.api-version>2010-06-15</test.eucalyptus-partnercloud-ec2.api-version>
-        <test.eucalyptus-partnercloud-ec2.build-version></test.eucalyptus-partnercloud-ec2.build-version>
+        <test.eucalyptus-partnercloud-ec2.build-version />
         <test.eucalyptus-partnercloud-ec2.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-ec2.identity>
         <test.eucalyptus-partnercloud-ec2.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-ec2.credential>
-        <test.eucalyptus-partnercloud-ec2.image-id></test.eucalyptus-partnercloud-ec2.image-id>
+        <test.eucalyptus-partnercloud-ec2.image-id />
         <!--  corresponds to image manifest and also virt + "-cluster" zone -->
         <test.eucalyptus-partnercloud-ec2.virtualization-type>kvm</test.eucalyptus-partnercloud-ec2.virtualization-type>
     </properties>
diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml
index 543407c..6eb3ca7 100644
--- a/providers/eucalyptus-partnercloud-s3/pom.xml
+++ b/providers/eucalyptus-partnercloud-s3/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.eucalyptus-partnercloud-s3.endpoint>http://partnercloud.eucalyptus.com:8773/services/Walrus</test.eucalyptus-partnercloud-s3.endpoint>
         <test.eucalyptus-partnercloud-s3.api-version>2006-03-01</test.eucalyptus-partnercloud-s3.api-version>
-        <test.eucalyptus-partnercloud-s3.build-version></test.eucalyptus-partnercloud-s3.build-version>
+        <test.eucalyptus-partnercloud-s3.build-version />
         <test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
         <test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
         <test.blobstore.container-count>15</test.blobstore.container-count>
diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml
index 87063ab..444a4ba 100644
--- a/providers/go2cloud-jhb1/pom.xml
+++ b/providers/go2cloud-jhb1/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.go2cloud-jhb1.endpoint>http://api.jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint>
         <test.go2cloud-jhb1.api-version>2.0</test.go2cloud-jhb1.api-version>
-        <test.go2cloud-jhb1.build-version></test.go2cloud-jhb1.build-version>
+        <test.go2cloud-jhb1.build-version />
         <test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>
         <test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential>
-        <test.go2cloud-jhb1.image-id></test.go2cloud-jhb1.image-id>
+        <test.go2cloud-jhb1.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index 23a0921..5cf5469 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.gogrid.endpoint>https://api.gogrid.com/api</test.gogrid.endpoint>
         <test.gogrid.api-version>1.5</test.gogrid.api-version>
-        <test.gogrid.build-version></test.gogrid.build-version>
+        <test.gogrid.build-version />
         <test.gogrid.identity>FIXME</test.gogrid.identity>
         <test.gogrid.credential>FIXME</test.gogrid.credential>
-        <test.gogrid.image-id></test.gogrid.image-id>
+        <test.gogrid.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml
index 9c1e60d..da6b14e 100644
--- a/providers/greenhousedata-element-vcloud/pom.xml
+++ b/providers/greenhousedata-element-vcloud/pom.xml
@@ -39,9 +39,9 @@
         <test.greenhousedata-element-vcloud.build-version>1.5.0.464915</test.greenhousedata-element-vcloud.build-version>
         <test.greenhousedata-element-vcloud.identity>FIXME_IDENTITY</test.greenhousedata-element-vcloud.identity>
         <test.greenhousedata-element-vcloud.credential>FIXME_CREDENTIAL</test.greenhousedata-element-vcloud.credential>
-        <test.greenhousedata-element-vcloud.image-id></test.greenhousedata-element-vcloud.image-id>
-        <test.greenhousedata-element-vcloud.image.login-user></test.greenhousedata-element-vcloud.image.login-user>
-        <test.greenhousedata-element-vcloud.image.authenticate-sudo></test.greenhousedata-element-vcloud.image.authenticate-sudo>
+        <test.greenhousedata-element-vcloud.image-id />
+        <test.greenhousedata-element-vcloud.image.login-user />
+        <test.greenhousedata-element-vcloud.image.authenticate-sudo />
     </properties>
 
     <dependencies>
diff --git a/providers/hpcloud-compute/pom.xml b/providers/hpcloud-compute/pom.xml
index dd4ba59..967ea84 100644
--- a/providers/hpcloud-compute/pom.xml
+++ b/providers/hpcloud-compute/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.hpcloud-compute.endpoint>https://region-a.geo-1.identity.hpcloudsvc.com:35357</test.hpcloud-compute.endpoint>
     <test.hpcloud-compute.api-version>1.1</test.hpcloud-compute.api-version>
-    <test.hpcloud-compute.build-version></test.hpcloud-compute.build-version>
+    <test.hpcloud-compute.build-version />
     <test.hpcloud-compute.identity>FIXME_IDENTITY</test.hpcloud-compute.identity>
     <test.hpcloud-compute.credential>FIXME_CREDENTIAL</test.hpcloud-compute.credential>
-    <test.hpcloud-compute.image-id></test.hpcloud-compute.image-id>
-    <test.hpcloud-compute.image.login-user></test.hpcloud-compute.image.login-user>
-    <test.hpcloud-compute.image.authenticate-sudo></test.hpcloud-compute.image.authenticate-sudo>
+    <test.hpcloud-compute.image-id />
+    <test.hpcloud-compute.image.login-user />
+    <test.hpcloud-compute.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/hpcloud-objectstorage/pom.xml b/providers/hpcloud-objectstorage/pom.xml
index 360b992..715a3c0 100644
--- a/providers/hpcloud-objectstorage/pom.xml
+++ b/providers/hpcloud-objectstorage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.hpcloud-objectstorage.endpoint>https://region-a.geo-1.identity.hpcloudsvc.com:35357</test.hpcloud-objectstorage.endpoint>
         <test.hpcloud-objectstorage.api-version>1.0</test.hpcloud-objectstorage.api-version>
-        <test.hpcloud-objectstorage.build-version></test.hpcloud-objectstorage.build-version>
+        <test.hpcloud-objectstorage.build-version />
         <test.hpcloud-objectstorage.identity>FIXME_IDENTITY</test.hpcloud-objectstorage.identity>
         <test.hpcloud-objectstorage.credential>FIXME_CREDENTIAL</test.hpcloud-objectstorage.credential>        
     </properties>
diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml
index 043a3b3..ab0cc7b 100644
--- a/providers/ninefold-compute/pom.xml
+++ b/providers/ninefold-compute/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.ninefold-compute.endpoint>https://api.ninefold.com/compute/v1.0/</test.ninefold-compute.endpoint>
     <test.ninefold-compute.api-version>2.2.12</test.ninefold-compute.api-version>
-    <test.ninefold-compute.build-version></test.ninefold-compute.build-version>
+    <test.ninefold-compute.build-version />
     <test.ninefold-compute.identity>FIXME_IDENTITY</test.ninefold-compute.identity>
     <test.ninefold-compute.credential>FIXME_CREDENTIAL</test.ninefold-compute.credential>
     <test.ninefold-compute.image-id>1215</test.ninefold-compute.image-id>
diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml
index a25d2ae..ba03eaf 100644
--- a/providers/ninefold-storage/pom.xml
+++ b/providers/ninefold-storage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.ninefold-storage.endpoint>http://onlinestorage.ninefold.com</test.ninefold-storage.endpoint>
         <test.ninefold-storage.api-version>1.4.0</test.ninefold-storage.api-version>
-        <test.ninefold-storage.build-version></test.ninefold-storage.build-version>
+        <test.ninefold-storage.build-version />
         <test.ninefold-storage.identity>FIXME_IDENTITY</test.ninefold-storage.identity>
         <test.ninefold-storage.credential>FIXME_CREDENTIAL</test.ninefold-storage.credential>
     </properties>
diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml
index 2f4fc2d..536bd28 100644
--- a/providers/openhosting-east1/pom.xml
+++ b/providers/openhosting-east1/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.openhosting-east1.endpoint>https://api.east1.openhosting.com</test.openhosting-east1.endpoint>
         <test.openhosting-east1.api-version>2.0</test.openhosting-east1.api-version>
-        <test.openhosting-east1.build-version></test.openhosting-east1.build-version>
+        <test.openhosting-east1.build-version />
         <test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity>
         <test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential>
-        <test.openhosting-east1.image-id></test.openhosting-east1.image-id>
+        <test.openhosting-east1.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml
index 08fa382..67948ea 100644
--- a/providers/rimuhosting/pom.xml
+++ b/providers/rimuhosting/pom.xml
@@ -36,9 +36,9 @@
     <properties>
         <test.rimuhosting.endpoint>https://api.rimuhosting.com/r</test.rimuhosting.endpoint>
         <test.rimuhosting.api-version>1.0</test.rimuhosting.api-version>
-        <test.rimuhosting.build-version></test.rimuhosting.build-version>
+        <test.rimuhosting.build-version />
         <test.rimuhosting.identity>FIXME</test.rimuhosting.identity>
-        <test.rimuhosting.image-id></test.rimuhosting.image-id>
+        <test.rimuhosting.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index 9d70165..1d7f89f 100644
--- a/providers/serverlove-z1-man/pom.xml
+++ b/providers/serverlove-z1-man/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.serverlove-z1-man.endpoint>https://api.z1-man.serverlove.com</test.serverlove-z1-man.endpoint>
         <test.serverlove-z1-man.api-version>1.0</test.serverlove-z1-man.api-version>
-        <test.serverlove-z1-man.build-version></test.serverlove-z1-man.build-version>
+        <test.serverlove-z1-man.build-version />
         <test.serverlove-z1-man.identity>FIXME_IDENTITY</test.serverlove-z1-man.identity>
         <test.serverlove-z1-man.credential>FIXME_CREDENTIAL</test.serverlove-z1-man.credential>
-        <test.serverlove-z1-man.image-id></test.serverlove-z1-man.image-id>
+        <test.serverlove-z1-man.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml
index 5f82480..823188e 100644
--- a/providers/skalicloud-sdg-my/pom.xml
+++ b/providers/skalicloud-sdg-my/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.skalicloud-sdg-my.endpoint>https://api.sdg-my.skalicloud.com</test.skalicloud-sdg-my.endpoint>
         <test.skalicloud-sdg-my.api-version>1.0</test.skalicloud-sdg-my.api-version>
-        <test.skalicloud-sdg-my.build-version></test.skalicloud-sdg-my.build-version>
+        <test.skalicloud-sdg-my.build-version />
         <test.skalicloud-sdg-my.identity>FIXME_IDENTITY</test.skalicloud-sdg-my.identity>
         <test.skalicloud-sdg-my.credential>FIXME_CREDENTIAL</test.skalicloud-sdg-my.credential>
-        <test.skalicloud-sdg-my.image-id></test.skalicloud-sdg-my.image-id>
+        <test.skalicloud-sdg-my.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml
index f1ae925..c445b14 100644
--- a/providers/slicehost/pom.xml
+++ b/providers/slicehost/pom.xml
@@ -36,9 +36,9 @@
     <properties>
         <test.slicehost.endpoint>https://api.slicehost.com</test.slicehost.endpoint>
         <test.slicehost.api-version>1.4.1.1</test.slicehost.api-version>
-        <test.slicehost.build-version></test.slicehost.build-version>
+        <test.slicehost.build-version />
         <test.slicehost.identity>FIXME</test.slicehost.identity>
-        <test.slicehost.image-id></test.slicehost.image-id>
+        <test.slicehost.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml
index d37ec00..6915b54 100644
--- a/providers/softlayer/pom.xml
+++ b/providers/softlayer/pom.xml
@@ -50,12 +50,12 @@
   <properties>
     <test.softlayer.endpoint>https://api.softlayer.com/rest</test.softlayer.endpoint>
     <test.softlayer.api-version>3</test.softlayer.api-version>
-    <test.softlayer.build-version></test.softlayer.build-version>
+    <test.softlayer.build-version />
     <test.softlayer.identity>FIXME</test.softlayer.identity>
     <test.softlayer.credential>FIXME</test.softlayer.credential>
-    <test.softlayer.image-id></test.softlayer.image-id>
-    <test.softlayer.image.login-user></test.softlayer.image.login-user>
-    <test.softlayer.image.authenticate-sudo></test.softlayer.image.authenticate-sudo>
+    <test.softlayer.image-id />
+    <test.softlayer.image.login-user />
+    <test.softlayer.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml
index f39e9ff..deb5c6c 100644
--- a/providers/stratogen-vcloud-mycloud/pom.xml
+++ b/providers/stratogen-vcloud-mycloud/pom.xml
@@ -39,9 +39,9 @@
         <test.stratogen-vcloud-mycloud.build-version>1.5.0.464915</test.stratogen-vcloud-mycloud.build-version>
         <test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity>
         <test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential>
-        <test.stratogen-vcloud-mycloud.image-id></test.stratogen-vcloud-mycloud.image-id>
-        <test.stratogen-vcloud-mycloud.image.login-user></test.stratogen-vcloud-mycloud.image.login-user>
-        <test.stratogen-vcloud-mycloud.image.authenticate-sudo></test.stratogen-vcloud-mycloud.image.authenticate-sudo>
+        <test.stratogen-vcloud-mycloud.image-id />
+        <test.stratogen-vcloud-mycloud.image.login-user />
+        <test.stratogen-vcloud-mycloud.image.authenticate-sudo />
     </properties>
 
     <dependencies>
diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml
index 8eb2a76..ed2abb6 100644
--- a/providers/synaptic-storage/pom.xml
+++ b/providers/synaptic-storage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.synaptic-storage.endpoint>https://storage.synaptic.att.com</test.synaptic-storage.endpoint>
         <test.synaptic-storage.api-version>1.3.0</test.synaptic-storage.api-version>
-        <test.synaptic-storage.build-version></test.synaptic-storage.build-version>
+        <test.synaptic-storage.build-version />
         <test.synaptic-storage.identity>FIXME_IDENTITY</test.synaptic-storage.identity>
         <test.synaptic-storage.credential>FIXME_CREDENTIAL</test.synaptic-storage.credential>
     </properties>
diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml
index c6682dd..854a2a8 100644
--- a/providers/trmk-ecloud/pom.xml
+++ b/providers/trmk-ecloud/pom.xml
@@ -37,10 +37,10 @@
         <test.trmk-ecloud.endpoint>https://services.enterprisecloud.terremark.com/api</test.trmk-ecloud.endpoint>
         <test.trmk-ecloud.datacenter>MIA</test.trmk-ecloud.datacenter>
         <test.trmk-ecloud.api-version>0.8b-ext2.8</test.trmk-ecloud.api-version>
-        <test.trmk-ecloud.build-version></test.trmk-ecloud.build-version>
+        <test.trmk-ecloud.build-version />
         <test.trmk-ecloud.identity>FIXME</test.trmk-ecloud.identity>
         <test.trmk-ecloud.credential>FIXME</test.trmk-ecloud.credential>
-        <test.trmk-ecloud.image-id></test.trmk-ecloud.image-id>
+        <test.trmk-ecloud.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml
index 66db21a..3b2ad8c 100644
--- a/providers/trmk-vcloudexpress/pom.xml
+++ b/providers/trmk-vcloudexpress/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.trmk-vcloudexpress.endpoint>https://services.vcloudexpress.terremark.com/api</test.trmk-vcloudexpress.endpoint>
         <test.trmk-vcloudexpress.api-version>0.8a-ext1.6</test.trmk-vcloudexpress.api-version>
-        <test.trmk-vcloudexpress.build-version></test.trmk-vcloudexpress.build-version>
+        <test.trmk-vcloudexpress.build-version />
         <test.trmk-vcloudexpress.identity>FIXME</test.trmk-vcloudexpress.identity>
         <test.trmk-vcloudexpress.credential>FIXME</test.trmk-vcloudexpress.credential>
-        <test.trmk-vcloudexpress.image-id></test.trmk-vcloudexpress.image-id>
+        <test.trmk-vcloudexpress.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/trystack-nova/pom.xml b/providers/trystack-nova/pom.xml
index c33d9e6..d174000 100644
--- a/providers/trystack-nova/pom.xml
+++ b/providers/trystack-nova/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.trystack-nova.endpoint>https://nova-api.trystack.org:5443</test.trystack-nova.endpoint>
     <test.trystack-nova.api-version>1.1</test.trystack-nova.api-version>
-    <test.trystack-nova.build-version></test.trystack-nova.build-version>
+    <test.trystack-nova.build-version />
     <test.trystack-nova.identity>FIXME_IDENTITY</test.trystack-nova.identity>
     <test.trystack-nova.credential>FIXME_CREDENTIAL</test.trystack-nova.credential>
-    <test.trystack-nova.image-id></test.trystack-nova.image-id>
-    <test.trystack-nova.image.login-user></test.trystack-nova.image.login-user>
-    <test.trystack-nova.image.authenticate-sudo></test.trystack-nova.image.authenticate-sudo>
+    <test.trystack-nova.image-id />
+    <test.trystack-nova.image.login-user />
+    <test.trystack-nova.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index 6667fb2..1b662b4 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -38,7 +38,7 @@
         <test.servermanager.identity>FIXME</test.servermanager.identity>
         <test.servermanager.endpoint>https://servermanager.com</test.servermanager.endpoint>
         <test.servermanager.api-version>1.0</test.servermanager.api-version>
-        <test.servermanager.build-version></test.servermanager.build-version>
+        <test.servermanager.build-version />
         <test.servermanager.identity>FIXME</test.servermanager.identity>
     </properties>
     <dependencies>