WIP Cartridge Refactor - Cleanup application container tests