Update test infra and tests