Fix helpers spec
Fix failing cli test