convert to a two-env var test scheme to offer parallel tests and fine-grained control