Return possibility to use CLI parameters & add unit tests (Vlad, use google)