Merge "Some scenario tests do not delete network resources"