Automate deletion of Infrastructure and cloud objects

Added test for deletion of infrastructure and cloud objects
These two functions cannot be part of the datastore class?