Waiver Test Updated