continued to move cli methods below the cli line. Trimmed the specs for the newly private methods. Added an integration spec for issue #17.