updated test infra