Tests hotfixed