Merge "Add environmental variables to test.conf"