Rewriting tests to match new updates.