Fixed tests for cli and closed issue