Add more Cucumber/Aruba tests for cli