Phone testing fixes