Fix the cli tests as well