Merge "Cleanup Tempest tests legacy resources"