Zebediah Figura : msi/tests: Simplify and combine environment variable tests.