Add a better test for service environment variables
Fix bugs.