Live testing fixes