Clean up duplicated cli tests