Do not assue shims are included when setting env variables
Fix failing tests