Real CLI integration spec

Uncommitted, think there is value capturing real CLI integration tests,
it's not straightforward coming to a simple and elegant solution.