New org cli tests