diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index eab04c3..a0a2a43 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -37,7 +37,7 @@
     <test.initializer>org.jclouds.atmos.blobstore.integration.AtmosStorageTestInitializer</test.initializer>
     <test.atmos.endpoint>https://accesspoint.atmos.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 19a98f2..7b88b0d 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 0ab0549..c747758 100644
--- a/apis/cloudfiles/pom.xml
+++ b/apis/cloudfiles/pom.xml
@@ -37,7 +37,7 @@
     <test.initializer>org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer</test.initializer>
     <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 f414c69..26f0057 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 6342b13..c839ce7 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 c2cc9a2..dc73a84 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 4c5626a..082ff4f 100644
--- a/apis/cloudstack/pom.xml
+++ b/apis/cloudstack/pom.xml
@@ -50,14 +50,14 @@
   <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.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.image-id />
+    <test.cloudstack.image.login-user />
+    <test.cloudstack.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml
index 559236a..a28021f 100644
--- a/apis/cloudwatch/pom.xml
+++ b/apis/cloudwatch/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.cloudwatch.endpoint>
     <test.cloudwatch.api-version>2009-05-15</test.cloudwatch.api-version>
-    <test.cloudwatch.build-version></test.cloudwatch.build-version>
+    <test.cloudwatch.build-version />
     <test.cloudwatch.identity>${test.aws.identity}</test.cloudwatch.identity>
     <test.cloudwatch.credential>${test.aws.credential}</test.cloudwatch.credential>
   </properties>
diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml
index 476c9ce..4fcf0e2 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 ae171c5..f8d0d7a 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 c51c596..a42ba3f 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 272ab50..a380773 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/s3/pom.xml b/apis/s3/pom.xml
index 0dd8533..bf07bbb 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -37,7 +37,7 @@
     <test.initializer>org.jclouds.s3.blobstore.integration.S3TestInitializer</test.initializer>
     <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 a998434..323b687 100644
--- a/apis/swift/pom.xml
+++ b/apis/swift/pom.xml
@@ -37,7 +37,7 @@
     <test.initializer>org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer</test.initializer>
     <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 32e42bb..95105ea 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 0febe97..f98f509 100644
--- a/apis/walrus/pom.xml
+++ b/apis/walrus/pom.xml
@@ -37,7 +37,7 @@
     <test.initializer>org.jclouds.walrus.blobstore.WalrusTestInitializer</test.initializer>
     <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/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml
index d77927a..2ecbae0 100644
--- a/providers/aws-cloudwatch/pom.xml
+++ b/providers/aws-cloudwatch/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.aws-cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.aws-cloudwatch.endpoint>
         <test.aws-cloudwatch.api-version>2009-05-15</test.aws-cloudwatch.api-version>
-        <test.aws-cloudwatch.build-version></test.aws-cloudwatch.build-version>
+        <test.aws-cloudwatch.build-version />
         <test.aws-cloudwatch.identity>${test.aws.identity}</test.aws-cloudwatch.identity>
         <test.aws-cloudwatch.credential>${test.aws.credential}</test.aws-cloudwatch.credential>
     </properties>
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index 5eefe3d..7d04ba4 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 2ffd814..07e378d 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 e573264..e62ee57 100644
--- a/providers/azureblob/pom.xml
+++ b/providers/azureblob/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.azureblob.blobstore.integration.AzureBlobTestInitializer</test.initializer>
         <test.azureblob.endpoint>https://{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 231b167..1ecd381 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.0.0.285979</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 2afc244..0aa8cf1 100644
--- a/providers/cloudfiles-uk/pom.xml
+++ b/providers/cloudfiles-uk/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUKTestInitializer</test.initializer>
         <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 c7df756..09c7719 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 6ca7dbd..a7627c7 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 d702ea7..9825907 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 14a5fbd..1f068fe 100644
--- a/providers/cloudonestorage/pom.xml
+++ b/providers/cloudonestorage/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.cloudonestorage.blobstore.integration.CloudOneStorageTestInitializer</test.initializer>
         <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 4469ea3..cb9e44b 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 33bbf9f..60a05b6 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 05344a9..3fac312 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 937380d..f6efeeb 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 226b63f..6bbff1a 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 4f8cd50..30031b6 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 b3399fb..f9b6c94 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 fbc6091..7fb47a9 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 63dddbc..cdb78e5 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 aa65433..66ccf58 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 40e5723..5c61a49 100644
--- a/providers/eucalyptus-partnercloud-s3/pom.xml
+++ b/providers/eucalyptus-partnercloud-s3/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer</test.initializer>
         <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 a188534..3d603c2 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 8c4f6b1..0e5bbaf 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/hpcloud-objectstorage-lvs/pom.xml b/providers/hpcloud-objectstorage-lvs/pom.xml
index b287a94..5c647bc 100644
--- a/providers/hpcloud-objectstorage-lvs/pom.xml
+++ b/providers/hpcloud-objectstorage-lvs/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.hpcloud.objectstorage.lvs.blobstore.integration.HPCloudObjectStorageLasVegasTestInitializer</test.initializer>
         <test.hpcloud-objectstorage-lvs.endpoint>https://region-a.geo-1.objects.hpcloudsvc.com/auth</test.hpcloud-objectstorage-lvs.endpoint>
         <test.hpcloud-objectstorage-lvs.api-version>1.0</test.hpcloud-objectstorage-lvs.api-version>
-        <test.hpcloud-objectstorage-lvs.build-version></test.hpcloud-objectstorage-lvs.build-version>
+        <test.hpcloud-objectstorage-lvs.build-version />
         <test.hpcloud-objectstorage-lvs.identity>FIXME_IDENTITY</test.hpcloud-objectstorage-lvs.identity>
         <test.hpcloud-objectstorage-lvs.credential>FIXME_CREDENTIAL</test.hpcloud-objectstorage-lvs.credential>        
     </properties>
diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml
index e033a33..1f030d7 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 4c5581b..7437f02 100644
--- a/providers/ninefold-storage/pom.xml
+++ b/providers/ninefold-storage/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.ninefold.storage.blobstore.integration.NinefoldStorageTestInitializer</test.initializer>
         <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 d560257..acbd10e 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 9fd412d..f28bef9 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/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml
index 5bab196..e00b4db 100644
--- a/providers/savvis-symphonyvpdc/pom.xml
+++ b/providers/savvis-symphonyvpdc/pom.xml
@@ -50,10 +50,10 @@
     <properties>
         <test.savvis-symphonyvpdc.endpoint>https://api.symphonyvpdc.savvis.net/vpdc</test.savvis-symphonyvpdc.endpoint>
         <test.savvis-symphonyvpdc.api-version>1.0</test.savvis-symphonyvpdc.api-version>
-        <test.savvis-symphonyvpdc.build-version></test.savvis-symphonyvpdc.build-version>
+        <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/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index 25cfd13..24de365 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 d63a715..25637b0 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 82e2827..e4c5331 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 b60caf5..c37cacb 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/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml
index 8edeaa6..5dd2dd9 100644
--- a/providers/synaptic-storage/pom.xml
+++ b/providers/synaptic-storage/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.synaptic.storage.blobstore.integration.SynapticStorageTestInitializer</test.initializer>
         <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 b50ba6b..f92a4bc 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 18835cd..ff7497d 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/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index e3dd9b9..4b57613 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>