One more test and cli fixed