Fixed tests and cli from zone to pod