Finish work with CLI. Some tests done/