Migrating environ tests to catch