integration tests
Extends the cli + refactoring