CLI testing improved