Re-adding the cli test program.