WIP Cartridge Refactor - Add new environment variables

* remove obsoleted test