Fix tests and update waiver changes