Test infra a little better.