Rearranged test suite environment variables so that individual tests