Merge "tempest: Don't hardcode the network name"