Moved some code below the private in CLI and updated some specs to no longer need some of the methods that were made private.