Fix broken common tests

This fixes a few tests that fail when the environment variables aren't set.