Add more CLI tests