Merge "Remove Sahara tests from Tempest"