Extract private inner classes in CLI out to their own class. Refactored for broken tests. Added new files to spec helper and the gemspec.