Expand cli test, cleaned up message output