Automate deletion of Infrastructure and cloud objects

Added test for deletion of infrastructure and cloud objects
Nice cleanup!