Fixed some broken cli tests