Switch cli test to spec format.

Conflicts:
	test/cli_test.rb