Merge "Skip tests when heat is unavailable"