Updated test infra