Fix naming, upgrade status testing