Refactoring CLI. Add info about test computer.