diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
index 7c669618c6..60f378f9ce 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
@@ -34,15 +34,16 @@ public enum GuestIPType {
     * network. Dhcp role is played by domain router.
     */
    VIRTUAL,
+
    /**
     * traffic directly to the network and VMs created here are assigned an IP
     * directly from the network as configured
     */
    DIRECT,
 
-       /**
-        * Not sure what exactly these *are* yet, but I know they exist in CS3.
-        */
+   /**
+    * TODO: add comments to explain the meaning (cs3 only)
+    */
    SHARED,
    ISOLATED,
 
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java
index e2cd33c5ae..3e1ea3009e 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java
@@ -56,7 +56,6 @@ public class AccountClientLiveTest extends BaseCloudStackClientLiveTest {
          assert user.getLastName() != null : user;
          assert user.getFirstName() != null : user;
          assert user.getId() != null : user;
-         assert user.getSecretKey() != null : user;
          assert user.getState() != null : user;
       }
       assert account.getIPsAvailable() == null || account.getIPsAvailable() >= 0 : account;
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
index b9943420cc..a122ce1bd3 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
@@ -65,6 +65,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
       }
    }
 
+   @Test
    public void testCreateGuestVirtualNetwork() {
       if (!networksSupported)
          return;
@@ -94,13 +95,12 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
       }
    }
 
+   @Test
    public void testCreateVLANNetwork() {
+      skipIfNotDomainAdmin();
       if (!networksSupported)
          return;
-      if (!domainAdminEnabled) {
-         Logger.getAnonymousLogger().log(Level.SEVERE, "domainAdmin credentials not present, skipping test");
-         return;
-      }
+
       final NetworkOffering offering;
       try {
          offering = get(
@@ -130,6 +130,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
       }
    }
 
+   @Test
    public void testListNetworks() throws Exception {
       if (!networksSupported)
          return;
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
index cf22229f41..2df4cc8544 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
@@ -110,8 +110,8 @@ public class TemplateClientLiveTest extends BaseCloudStackClientLiveTest {
             return network != null && network.getState().equals("Implemented");
          }
       });
-      assertEquals(Iterables.size(networks), 1);
-      Network network = Iterables.getOnlyElement(networks, null);
+      assertTrue(Iterables.size(networks) >= 1);
+      Network network = Iterables.get(networks, 0);
       assertNotNull(network);
 
       // Create a VM and stop it
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
index 8cff27206b..fd2a37c6b0 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
@@ -336,6 +336,7 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
       super.tearDown();
    }
 
+   @Test
    public void testListVirtualMachines() throws Exception {
       Set<VirtualMachine> response = client.getVirtualMachineClient().listVirtualMachines();
       assert null != response;