Updates test/support to use env vars