- refactored tests
- implemented generation of command line