Make sure instance is deleted after test_instance_properties, and

renamed test according to convention.

test/__init__.py

@@ -27,9 +27,9 @@ as a base class to each combination).
 """
 import cloudbridge
 from test.helpers import ProviderTestCaseGenerator
-from test.test_compute_service import ProviderComputeServiceTestCase
 from test.test_provider_block_store_service import \
     ProviderBlockStoreServiceTestCase
+from test.test_provider_compute_service import ProviderComputeServiceTestCase
 from test.test_provider_image_service import ProviderImageServiceTestCase
 from test.test_provider_interface import ProviderInterfaceTestCase
 from test.test_provider_object_store_service import \

test/test_compute_service.py → test/test_provider_compute_service.py

@@ -71,3 +71,4 @@ class ProviderComputeServiceTestCase(ProviderTestBase):
             self.assertTrue(
                 self._is_valid_ip(ip_address),
                 "Instance must have a valid IP address")
+            test_instance.terminate()