cli test fixes